Updated to the latest versions of Java and Scala. Also reformatted the source code to a width of 96.