Upgrades to Scala 2.10