Simplify command line options and improve help
Merge pull request #40 from vanilla/feature/cmd-simplify

Simplify command line options and improve help