More scala/sbt tweaks