Added some wildcards to some of the rule matches
Merge pull request #312 from jsight/rule_tweaks

Added some wildcards to some of the rule matches