upgrade to ScalaTest 2.1-RC1
upgrade to ScalaTest 2.1.0-RC2
upgrade to ScalaTest 2.1.0-RC3
upgrade to ScalaTest 2.1
explicitly tell Travis what JDK we want

even though oraclejdk7 is actually the default
upgrade to ScalaTest 2.1.1
travis linter says this is wrong to include
Merge branch 'master' into scala-2.10.4

Conflicts:
	.travis.yml
upgrade to Scala 2.10.4