Add AND, NOT matchers.  Move to matchers.logic pattern, add LogicMatcher super-class.
Tidy names