Revert "seporate CLI from main entry point and add global rescue block"

Methadone offers this feature built in (dammit)
http://www.naildrivin5.com/blog/2011/12/19/methadone-the-awesome-cli-library.html