Put command-specific option help first.
Merge pull request #633 from hjoliver/reorder-command-options

Put command-specific option help first.