The devel branch now contains
PR #3390, the latest work on Leo's options code.
I've merged this branch early for several reasons:
- Thomas has signed off on the code.
- Because of the reorg, the diffs in the PR are almost useless.
- New unit tests cover all the code.
- We should all test the code asap.
Edward