saltstack/salt — pull request #18684 by rallytime (2014-12-03 19:28:31+00:00)
Title: Fix pylint errors

Removed unused import and removed merge conflict remainder.