upgrade to ScalaTest 2.1-RC1
Pair has been deprecated
upgrade to Scala 2.11.0-M8
Merge branch 'scalatest-2.1' into scala-2.11

Conflicts:
	build.sbt