Removed ye olde org.scalatest.matchers.ShouldMatchers, which has been deprecated
since the 2.0 release, which came out over a year ago. King of sad to see them go.
Pulled in the latest changes from 2.2.x, which was the removal of
org.scalatest.matchers.ShouldMatchers, which was deprecated in 2.0,
release just over a year ago.
Merge branch '2.2.x' of https://github.com/scalatest/scalatest

Conflicts:
	src/test/scala/org/scalatest/matchers/ShouldStartWithSubstringSpec.scala