Standardize CLI options
Merge pull request #17 from escherba/dev

Standardize CLI options