Refactored OptionShouldContainSpec, found one paren config that isn't supported yet.
Merge branch 'master' of https://github.com/scalatest/scalatest
Refactored OptionShouldContainSpec a bit more.