2014.7

Misc cleanups while I was looking into a reported issue with syndics.
@jacksontj I don't `grains.a lot` is valid here. I think that spelling/example will work for fine with the space for yaml because yaml will parse that as a string, but I don't think jinja parse that correctly. Maybe that key should be something spelled correctly, but also does not have a space. Thoughts?