Update configure.rb

Adds java.home setting to jvm config for java7 update
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into curt-dev