Fix typo
Merge pull request #17325 from basepi/2014.1lintfix

Fix typo in 2014.1
Fix passing pillar data to state.show_sls
Merge pull request #18066 from terminalmage/show_sls_cli_pillar

Fix passing pillar data to state.show_sls (2014.1 branch) Jenkins failures not related
Merge branch '2014.1' of github.com:saltstack/salt into 2014.1