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