Even more sbt/scala tweaks