saltstack/salt — pull request #17698 by basepi (2014-11-11 18:12:45+00:00)
Title: Fix pylint and matcher problems from merge forward

The matcher had been changed a bit in `develop` so the merge forward broke my pillar/compound fixes. This should put them back in working order, and fix the pylint in the process.