Chris
minor refactoring and renamed cli.py to __main__ to reflect its true purpose
fdb2846