Upgraded to Scala 2.10

Just the bare minimum to compile under Scala 2.10.