Update ScalaTest to 2.0
Merge pull request #279 from wajam/alex-scalatest-2

Update ScalaTest to 2.0