Restore the ordering of the help output to what is was before the restructure.
Merge pull request #56 from yschaeff/help_ordering

Restore the ordering of the help output to what is was before the restru...