Simplify grains a little, plus google doesn't allow _'s in tags/roles
Merge pull request #2 from iggy/simpleroles

Simplify grains a little, plus google doesn't allow _'s in tags/roles