Upgrade Scala to version 2.10.1 and Scalatest to version 2.0.M6-SNAP20
Merge pull request #872 from chrisleishman/upgrade_scala

Upgrade Scala to version 2.10.1 and Scalatest to version 2.0.M6-SNAP20