Make help output more consistent
Merge pull request #698 from tombell/clean-up-help

Make `help` command output more consistent