Remove redundancy in "or" & "and" AOP matchers

The following methods to the matcher class don't need the word "match" in then since they already need a matcher passed into them

Shorten the names of the methods to just "or()" and "and()". Also add "$or()" and "$and()" for Adobe's parser (like Criteria Builder). This will make the DSL more succinct and readable.