Configure options reorganization
Merge pull request #160

1ba4a60 Configure options reorganization (Pieter Wuille)