Made edits to the build scripts to properly install Oracle Java 1.7 and Tomcat 7, as well as fix some of the issues introduced by pulling in the main branch.