Merge pull request #1 from mongodb/master

Merge in latest from mongodb/morphia
Add variants of ensureIndexes() that accept String collectionName parameter
Unit tests for new ensureIndexes methods.
Merge pull request #2 from mongodb/master

Merge in latest from mongodb/morphia
Merge branch 'master' into Collection-name-indexes

Conflicts:
	morphia/src/main/java/org/mongodb/morphia/DatastoreImpl.java
Fix compile errors in TestIndexCollections
apply checkstyle fixes
Merge branch 'pull-request-541'