@EmbedMap should allow Key<?> keys

Also switched to java 1.7 for build.