Updated for scala 2.10 and sbt 0.13