Give the rules with a parameter much better names (except DeductionRule is broken, oddly)
Fix it for DeductionRule
Change all of the tests to use the more user-friendly parametrized Rule names
Merge pull request #664 from jadeoneill/master

Much more user-friendly rule names