should be all clean by now
Merge branch 'master' of github.com:hcatlin/bob