optionally use JAVA_HOME
target 1.6

Conflicts:
	project/GeocoderBuild.scala
make java7 hack actually work

Conflicts:
	project/GeocoderBuild.scala
	util/src/main/scala/NameNormalizer.scala