Add some basic Matchers and some Error Matchers
Merge pull request #1032 from srawlins/update-matchers-list

Add some basic Matchers and some Error Matchers