Minor clean-ups.
Fixed SBT Build.scala