Update java search paths; search JAVA_HOME last. Use java_home command on OS X to pick up java home path
Pass the environment JAVA_HOME through. Also change user ASAP without testing for java home, etc.