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
Merge branch 'master' into scala-2.11