Upgraded to scala-2.11.1
Switched to scalatest 2.2.0