Changes for supporting Scala 2.10.0 and SBT 0.12.2