Update Scala and SBT, clean up build config