diff --git a/salt/pillar.py b/salt/pillar.py
diff --git a/salt/renderers/json_jinja.py b/salt/renderers/json_jinja.py
diff --git a/salt/renderers/json_mako.py b/salt/renderers/json_mako.py
diff --git a/salt/renderers/py.py b/salt/renderers/py.py
diff --git a/salt/renderers/yaml_jinja.py b/salt/renderers/yaml_jinja.py
diff --git a/salt/renderers/yaml_mako.py b/salt/renderers/yaml_mako.py
diff --git a/salt/returners/local.py b/salt/returners/local.py
diff --git a/salt/runner.py b/salt/runner.py
diff --git a/salt/runners/jobs.py b/salt/runners/jobs.py
diff --git a/salt/runners/manage.py b/salt/runners/manage.py
diff --git a/salt/runners/network.py b/salt/runners/network.py
diff --git a/salt/state.py b/salt/state.py
diff --git a/salt/states/alias.py b/salt/states/alias.py
diff --git a/salt/states/cmd.py b/salt/states/cmd.py
diff --git a/salt/states/cron.py b/salt/states/cron.py
diff --git a/salt/states/file.py b/salt/states/file.py
diff --git a/salt/states/gem.py b/salt/states/gem.py
diff --git a/salt/states/group.py b/salt/states/group.py
diff --git a/salt/states/host.py b/salt/states/host.py
diff --git a/salt/states/mount.py b/salt/states/mount.py
diff --git a/salt/states/mysql_database.py b/salt/states/mysql_database.py
diff --git a/salt/states/mysql_grants.py b/salt/states/mysql_grants.py
diff --git a/salt/states/mysql_user.py b/salt/states/mysql_user.py
diff --git a/salt/states/network.py b/salt/states/network.py
diff --git a/salt/states/pip.py b/salt/states/pip.py
diff --git a/salt/states/pkg.py b/salt/states/pkg.py
diff --git a/salt/states/postgres_database.py b/salt/states/postgres_database.py
diff --git a/salt/states/rvm.py b/salt/states/rvm.py
diff --git a/salt/states/selinux.py b/salt/states/selinux.py
diff --git a/salt/states/service.py b/salt/states/service.py
diff --git a/salt/states/ssh_auth.py b/salt/states/ssh_auth.py
diff --git a/salt/states/sysctl.py b/salt/states/sysctl.py
diff --git a/salt/states/user.py b/salt/states/user.py
diff --git a/salt/states/virtualenv.py b/salt/states/virtualenv.py
diff --git a/salt/template.py b/salt/template.py
diff --git a/salt/utils/__init__.py b/salt/utils/__init__.py
diff --git a/salt/utils/find.py b/salt/utils/find.py
diff --git a/salt/utils/saltminionservice.py b/salt/utils/saltminionservice.py
diff --git a/salt/utils/templates.py b/salt/utils/templates.py
diff --git a/salt/utils/verify.py b/salt/utils/verify.py
diff --git a/salt/utils/winservice.py b/salt/utils/winservice.py
diff --git a/salt/utils/yaml.py b/salt/utils/yaml.py
diff --git a/salt/version.py b/salt/version.py
diff --git a/setup.py b/setup.py
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
diff --git a/tests/integration/client/kwarg.py b/tests/integration/client/kwarg.py
diff --git a/tests/integration/client/standard.py b/tests/integration/client/standard.py
diff --git a/tests/integration/client/syndic.py b/tests/integration/client/syndic.py
diff --git a/tests/integration/files/conf/master b/tests/integration/files/conf/master
diff --git a/tests/integration/files/conf/syndic b/tests/integration/files/conf/syndic
diff --git a/tests/integration/files/conf/syndic_master b/tests/integration/files/conf/syndic_master
diff --git a/tests/integration/files/ext.yaml b/tests/integration/files/ext.yaml
diff --git a/tests/integration/files/file/base/core.sls b/tests/integration/files/file/base/core.sls
diff --git a/tests/integration/files/file/base/grail/36/scene b/tests/integration/files/file/base/grail/36/scene
diff --git a/tests/integration/files/file/base/grail/empty b/tests/integration/files/file/base/grail/empty
diff --git a/tests/integration/files/file/base/grail/scene33 b/tests/integration/files/file/base/grail/scene33
diff --git a/tests/integration/files/file/base/testfile b/tests/integration/files/file/base/testfile
diff --git a/tests/integration/files/file/base/top.sls b/tests/integration/files/file/base/top.sls
diff --git a/tests/integration/files/pillar/base/generic.sls b/tests/integration/files/pillar/base/generic.sls
diff --git a/tests/integration/files/pillar/base/top.sls b/tests/integration/files/pillar/base/top.sls
diff --git a/tests/integration/modules/cmdmod.py b/tests/integration/modules/cmdmod.py
diff --git a/tests/integration/modules/cp.py b/tests/integration/modules/cp.py
diff --git a/tests/integration/modules/data.py b/tests/integration/modules/data.py
diff --git a/tests/integration/modules/disk.py b/tests/integration/modules/disk.py
diff --git a/tests/integration/modules/hosts.py b/tests/integration/modules/hosts.py
diff --git a/tests/integration/modules/pillar.py b/tests/integration/modules/pillar.py
diff --git a/tests/integration/modules/publish.py b/tests/integration/modules/publish.py
diff --git a/tests/integration/modules/state.py b/tests/integration/modules/state.py
diff --git a/tests/integration/modules/sysmod.py b/tests/integration/modules/sysmod.py
diff --git a/tests/integration/shell/key.py b/tests/integration/shell/key.py
diff --git a/tests/integration/shell/runner.py b/tests/integration/shell/runner.py
diff --git a/tests/minionswarm.py b/tests/minionswarm.py
diff --git a/tests/runtests.py b/tests/runtests.py
diff --git a/tests/saltunittest.py b/tests/saltunittest.py
diff --git a/tox.ini b/tox.ini