Fix broken Scala 2.10 upgrade and upgrade SBT to 0.13.5, sbt-assembly to 0.11.2