Some more cleanup to grains outputter, closer to working
Some more cleanup to grains outputter, closer to working

Conflicts:
	salt/output/grains.py

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt