Updated to Scala 2.11.4 and ScalaTest 2.2.1