Improved hg heads, vagrant setup and always set JAVA_HOME to a v7 JDK