Incorporated pull request comments.

* Added in --help flag.
* Restored indentation to 2 spaces
* Made "tab_stops" consistent
* Restored default cli behavior.