got rid of bad exception handling and config defaults
Merge branch 'master' of github.com:mattvenn/cad