Upgraded spring-data-mongodb

Switch the spring-data-mongodb dependency to 1.6.1 so that we can use
Java 8.  This required some other changes (to do with generic types)
due to some changes in the spring-data-mongodb library.