better parsing of command line (see issue #13)
Merge branch 'master' of github.com:stefanjudis/cushion-cli