Update to Scala 2.11.1 and Scalatest 2.1.6