Brought back StringShouldWrapper to deal with problem of importing Matchers._
above FlatSpec (and WordSpec), which broke in 2.1.RC1.
Merge branch '2.1.x' of https://github.com/scalatest/scalatest into 2.1.x