updates rule logic and propigates to policies
updates combining algorithms. utilizes match results
updates rule combining tests to reflect standard behavior
Merge pull request #1 from patrickhuber/work

Work