Merge branches 'master' and 'proxy' of github.com:jpeace/monger into proxy
fixed all tests for mongo mapper