Merge branch 'newMongoMerge' of https://github.com/jdaugherty/grails-data-mapping into newMongoMerge