upgrade to scalatest 2.2.1
Merge pull request #252 from unfiltered/upgrade_scalatest

upgrade to scalatest 2.2.1