fix misspelling and resolve conflict from moved files
Merge branch 'master' of github.com:qconner/mongo