adapted to sbt 0.13, cleaned up