Fix Scaladoc deprecation note in MustMatchers
Bumped ScalaTest version to 2.0.1-SNAP4.
Merge branch 'JIRA-288' of https://github.com/gcberger/scalatest
Re-re-re-reverting yet again the upgrade to ScalaCheck 1.11.0. Added one other improvement, fixed
a typo in some error messages in Configuration.scala.

This reverts commit 57680f49111428aa837cafa6f26f807291db0bb9.

Conflicts:

	build.xml
deploy-local target