cleaning up before mongo branch
Merge branch 'master' of github.com:tclark/db3