Updating to Scala 2.10