saltstack/salt — pull request #18207 by thatch45 (2014-11-18 16:24:13+00:00)
Title: Merge #18196 with fixes

Merge #18196 with fixes
Some minor lint stuff