Put related functions next to each other
Use consistent braces for functions
Use consistent function names
Update `--help` output

* No longer using `--severalunseparatewords` (but still accepts them for backwards compatibility)
* Use `<angled brackets>` for mandatory arguments (`[square brackets]` are for optional arguments)
Merge pull request #36 from Zearin/reorder-func

Did you happen to enable git-hooks in the git-hooks repo?  It should have prevented you from making commits that were not signed off on.