@EmbedMap should allow Key<?> keys

Also switched to java 1.7 for build.
Add reverse() method to Query
Bump pom to 4.0.1
Pom needs java 1.7
Merge remote-tracking branch 'upstream/master'