doh!
Use None, not empty dict in function definition
Fix fad method call and bad default arg
Send {} if grains is None
Clean up single quotes and the lines are too long

This still needs some style love
Merge pull request #6911 from UtahDave/fix_pillar

Fix pylint warning about {} in argument default.