Merge pull request #11 from tvaughan77/master

ISP-477 Post Java 7 upgrade cleanup and Prep for Jetty 8 upgrade