Make DiagrammedAssertions error message to work correctly on windows.
Fixed RequirementsSpec tests that broken on windows.
Fixed remaining tests that fails on windows.
Merge branch 'windows-fix' of https://github.com/cheeseng/scalatest into 2.2.x
Fix bug in error messages when oring matchers where the initial matcher matches.
Merge branch '2.2.x' of https://github.com/scalatest/scalatest