Updated version of Scala and SBT, plus other minor cleanups.