Matcher refactoring #9

* preliminary work: folding CayenneMatcher into Matcher
Matcher refactoring #9

* preliminary work: folding CayenneMatcher into Matcher