Merge pull request #333 from rspec/make_match_diffable

expect().to match does not give a diff when failing
Conflicts:
	Changelog.md