Merge pull request #93 from salt-formulas/andrewp-fix-class-mappings-regression

allow class mappings to match on node name or node path