Some cleanup
Merge branch 'master' of github.com:jturney/ambit