Update for Scala 2.10 and sbt 0.12