Git ignore
Merge pull request #14902 from cachedout/ignore_grains

Git ignore
No pending arg exists anymore
Merge pull request #14910 from thatch45/2014.7

No pending arg exists anymore
Fix esky updates