Cleaned up usage of grains match in JINJA to current best practice.
Also fixed a typo in the match on pillar-example.