Update to use Scala 2.10