Merge branch 'map-reduce-more' into mapreduce-v8

Conflicts:
	src/main/java/com/foursquare/fongo/impl/MapReduce.java