Cleanup comment
Derive from proper exception class
Don't clutter root with module files
Merge pull request #2 from ewilkins/cli-fixes

Cli fixes