Clean up the usage and help texts so that they are in sync

- Change help text syntax to match usage text syntax
- Add missing commands from help text
- Fix indentation

Also, show the version number in the usage text.
Merge pull request #96 from vocaro/usage-text-cleanup

Clean up the usage and help texts so that they are in sync