diff -ruN py-salt/Makefile py-salt-2014.7.0/Makefile
--- py-salt/Makefile	2014-10-17 02:57:06.000000000 -0600
+++ py-salt-2014.7.0/Makefile	2014-11-04 15:14:44.006336136 -0700
@@ -2,7 +2,7 @@
 # $FreeBSD: head/sysutils/py-salt/Makefile 371032 2014-10-17 08:57:06Z culot $
 
 PORTNAME=	salt
-PORTVERSION=	2014.1.13
+PORTVERSION=	2014.7.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,19 +12,21 @@
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.9:${PORTSDIR}/net/py-pyzmq
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.9:${PORTSDIR}/net/py-pyzmq \
+		${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.9:${PORTSDIR}/devel/py-msgpack \
-		${PYTHON_PKGNAMEPREFIX}libcloud>=0.11.4:${PORTSDIR}/net/py-libcloud \
+		${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.13:${PORTSDIR}/devel/py-msgpack \
+		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:${PORTSDIR}/net/py-libcloud \
 		${PYTHON_PKGNAMEPREFIX}botocore>0:${PORTSDIR}/devel/py-botocore \
 		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
-		sshpass>0:${PORTSDIR}/security/sshpass
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe \
+		${PYTHON_PKGNAMEPREFIX}requests>1:${PORTSDIR}/www/py-requests \
 
 USES=		python:2
 USE_PYTHON=	distutils
+PYDISTUTILS_EGGINFO=	salt-${DISTVERSION}-py${PYTHON_VER}.egg-info
 
 PYDISTUTILS_INSTALLARGS+=\
 		--prefix=${PREFIX} \
diff -ruN py-salt/distinfo py-salt-2014.7.0/distinfo
--- py-salt/distinfo	2014-10-17 02:57:06.000000000 -0600
+++ py-salt-2014.7.0/distinfo	2014-11-04 13:31:50.593741307 -0700
@@ -1,2 +1,2 @@
-SHA256 (salt-2014.1.13.tar.gz) = 0ab37478e18e6490eccef4deb9f77a20c99ffcc6f97b48e25eb546f8b73f3c22
-SIZE (salt-2014.1.13.tar.gz) = 2846659
+SHA256 (salt-2014.7.0.tar.gz) = d4a64436636a5e6839c1ae1d16052d2e965b9aed5c3c58735bd89fddb9a0ed5c
+SIZE (salt-2014.7.0.tar.gz) = 3518342
diff -ruN py-salt/files/patch-salt__grains__core.py py-salt-2014.7.0/files/patch-salt__grains__core.py
--- py-salt/files/patch-salt__grains__core.py	2014-03-19 01:03:52.000000000 -0600
+++ py-salt-2014.7.0/files/patch-salt__grains__core.py	2014-11-04 13:38:31.259726702 -0700
@@ -1,9 +1,9 @@
---- ./salt/grains/core.py.orig	2014-02-19 22:21:14.000000000 +0200
-+++ ./salt/grains/core.py	2014-03-06 10:50:07.000000000 +0200
-@@ -1133,7 +1133,7 @@
+--- ./salt/grains/core.py.orig  2014-11-03 12:38:21.000000000 -0700
++++ ./salt/grains/core.py       2014-11-04 13:34:47.769728417 -0700
+@@ -1320,7 +1320,7 @@
+     '''
      # Provides:
      #   path
- 
 -    return {'path': os.environ['PATH'].strip()}
 +    return {'path': os.environ['PATH'].strip() + ':/usr/local/bin:/usr/local/sbin'}
  
diff -ruN py-salt/files/patch-setup.py py-salt-2014.7.0/files/patch-setup.py
--- py-salt/files/patch-setup.py	2014-03-19 01:03:52.000000000 -0600
+++ py-salt-2014.7.0/files/patch-setup.py	2014-11-04 14:43:35.929444811 -0700
@@ -1,14 +1,30 @@
---- ./setup.py.orig	2014-03-06 10:50:27.000000000 +0200
-+++ ./setup.py	2014-03-06 10:52:20.000000000 +0200
-@@ -451,12 +451,12 @@
-                                     'virt/*.jinja'
-                                     ],
+--- setup.py.orig	2014-11-03 12:38:21.000000000 -0700
++++ setup.py        2014-11-04 14:42:58.775471457 -0700
+@@ -212,12 +212,12 @@
+             self.distribution.package_data.pop('salt.daemons.flo', None)
+             self.filelist.files.append(os.path.basename(PACKAGED_FOR_SALT_SSH_FILE))
+             self.distribution.metadata.name = 'salt-ssh'
+-            self.distribution.data_files = [('share/man/man1',
++            self.distribution.data_files = [('man/man1',
+                                              ['doc/man/salt-ssh.1',
+                                               'doc/man/salt-run.1',
+                                               'doc/man/salt-call.1',
+                                               'doc/man/salt-cloud.1']),
+-                                            ('share/man/man7', ['doc/man/salt.7'])]
++                                            ('man/man7', ['doc/man/salt.7'])]
+ 
+         sdist.make_release_tree(self, base_dir, files)
+ 
+@@ -666,13 +666,13 @@
+                                     '*.flo'
+                                     ]
                                  },
 -                'data_files': [('share/man/man1',
 +                'data_files': [('man/man1',
                                  ['doc/man/salt-cp.1',
                                   'doc/man/salt-call.1',
                                   'doc/man/salt-minion.1',
+                                  'doc/man/salt-unity.1',
                                   ]),
 -                               ('share/man/man7',
 +                               ('man/man7',
diff -ruN py-salt/pkg-plist py-salt-2014.7.0/pkg-plist
--- py-salt/pkg-plist	2014-10-17 02:57:06.000000000 -0600
+++ py-salt-2014.7.0/pkg-plist	2014-11-04 14:47:46.867436736 -0700
@@ -1,13 +1,4 @@
-bin/salt
-bin/salt-call
-bin/salt-cloud
-bin/salt-cp
-bin/salt-key
-bin/salt-master
-bin/salt-minion
-bin/salt-run
-bin/salt-ssh
-bin/salt-syndic
+
 %%ETCDIR%%/master.sample
 %%ETCDIR%%/minion.sample
 %%PYTHON_SITELIBDIR%%/salt/__init__.py
@@ -28,6 +19,8 @@
 %%PYTHON_SITELIBDIR%%/salt/auth/ldap.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/pam.py
 %%PYTHON_SITELIBDIR%%/salt/auth/pam.pyc
+%%PYTHON_SITELIBDIR%%/salt/auth/pki.py
+%%PYTHON_SITELIBDIR%%/salt/auth/pki.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/stormpath_mod.py
 %%PYTHON_SITELIBDIR%%/salt/auth/stormpath_mod.pyc
 %%PYTHON_SITELIBDIR%%/salt/cli/__init__.py
@@ -42,16 +35,26 @@
 %%PYTHON_SITELIBDIR%%/salt/client/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/api.py
 %%PYTHON_SITELIBDIR%%/salt/client/api.pyc
+%%PYTHON_SITELIBDIR%%/salt/client/mixins.py
+%%PYTHON_SITELIBDIR%%/salt/client/mixins.pyc
+%%PYTHON_SITELIBDIR%%/salt/client/netapi.py
+%%PYTHON_SITELIBDIR%%/salt/client/netapi.pyc
+%%PYTHON_SITELIBDIR%%/salt/client/raet/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/client/raet/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/shell.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/shell.pyc
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/ssh_py_shim.py
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/ssh_py_shim.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/state.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/state.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/config.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/config.pyc
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/cp.py
+%%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/cp.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/grains.py
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/grains.pyc
 %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper/pillar.py
@@ -64,6 +67,8 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/cli.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/aliyun.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/aliyun.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/botocore_aws.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/botocore_aws.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/cloudstack.py
@@ -76,22 +81,26 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/gce.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/gogrid.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/gogrid.pyc
-%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/ibmsce.py
-%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/ibmsce.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/joyent.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/joyent.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/libcloud_aws.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/libcloud_aws.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/linode.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/linode.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/lxc.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/lxc.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/msazure.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/msazure.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/nova.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/nova.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/opennebula.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/opennebula.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/openstack.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/openstack.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/parallels.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/parallels.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/proxmox.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/proxmox.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/rackspace.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/rackspace.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/saltify.py
@@ -100,6 +109,8 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Arch-git.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Arch.sh
 %%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Debian-git.sh
@@ -130,8 +141,28 @@
 %%PYTHON_SITELIBDIR%%/salt/config.pyc
 %%PYTHON_SITELIBDIR%%/salt/crypt.py
 %%PYTHON_SITELIBDIR%%/salt/crypt.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/core.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/core.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/maint.flo
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/maint.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/maint.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/master.flo
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/minion.flo
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/worker.flo
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/worker.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/flo/worker.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/masterapi.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/masterapi.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/salting.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/salting.pyc
 %%PYTHON_SITELIBDIR%%/salt/exceptions.py
 %%PYTHON_SITELIBDIR%%/salt/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/salt/exitcodes.py
+%%PYTHON_SITELIBDIR%%/salt/exitcodes.pyc
 %%PYTHON_SITELIBDIR%%/salt/ext/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/ext/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/fileclient.py
@@ -164,6 +195,8 @@
 %%PYTHON_SITELIBDIR%%/salt/grains/opts.pyc
 %%PYTHON_SITELIBDIR%%/salt/grains/rest_sample.py
 %%PYTHON_SITELIBDIR%%/salt/grains/rest_sample.pyc
+%%PYTHON_SITELIBDIR%%/salt/grains/ssds.py
+%%PYTHON_SITELIBDIR%%/salt/grains/ssds.pyc
 %%PYTHON_SITELIBDIR%%/salt/key.py
 %%PYTHON_SITELIBDIR%%/salt/key.pyc
 %%PYTHON_SITELIBDIR%%/salt/loader.py
@@ -202,8 +235,28 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/augeas_cfg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/aws_sqs.py
 %%PYTHON_SITELIBDIR%%/salt/modules/aws_sqs.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/blockdev.py
+%%PYTHON_SITELIBDIR%%/salt/modules/blockdev.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/bluez.py
 %%PYTHON_SITELIBDIR%%/salt/modules/bluez.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_asg.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_asg.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_cloudwatch.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_cloudwatch.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_elasticache.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_elasticache.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_elb.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_elb.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_iam.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_iam.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_route53.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_route53.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_secgroup.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_secgroup.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_sqs.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_sqs.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_vpc.py
+%%PYTHON_SITELIBDIR%%/salt/modules/boto_vpc.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/brew.py
 %%PYTHON_SITELIBDIR%%/salt/modules/brew.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/bridge.py
@@ -212,6 +265,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/bsd_shadow.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/cassandra.py
 %%PYTHON_SITELIBDIR%%/salt/modules/cassandra.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/chef.py
+%%PYTHON_SITELIBDIR%%/salt/modules/chef.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/chocolatey.py
 %%PYTHON_SITELIBDIR%%/salt/modules/chocolatey.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/cloud.py
@@ -234,6 +289,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/data.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/ddns.py
 %%PYTHON_SITELIBDIR%%/salt/modules/ddns.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/deb_apache.py
+%%PYTHON_SITELIBDIR%%/salt/modules/deb_apache.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/debconfmod.py
 %%PYTHON_SITELIBDIR%%/salt/modules/debconfmod.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/debian_ip.py
@@ -260,8 +317,12 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/ebuild.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/eix.py
 %%PYTHON_SITELIBDIR%%/salt/modules/eix.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/environ.py
+%%PYTHON_SITELIBDIR%%/salt/modules/environ.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/eselect.py
 %%PYTHON_SITELIBDIR%%/salt/modules/eselect.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/etcd_mod.py
+%%PYTHON_SITELIBDIR%%/salt/modules/etcd_mod.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/event.py
 %%PYTHON_SITELIBDIR%%/salt/modules/event.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/extfs.py
@@ -282,6 +343,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/freebsdservice.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/gem.py
 %%PYTHON_SITELIBDIR%%/salt/modules/gem.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/genesis.py
+%%PYTHON_SITELIBDIR%%/salt/modules/genesis.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/gentoo_service.py
 %%PYTHON_SITELIBDIR%%/salt/modules/gentoo_service.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/gentoolkitmod.py
@@ -290,6 +353,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/git.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/glance.py
 %%PYTHON_SITELIBDIR%%/salt/modules/glance.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/glusterfs.py
+%%PYTHON_SITELIBDIR%%/salt/modules/glusterfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/gnomedesktop.py
 %%PYTHON_SITELIBDIR%%/salt/modules/gnomedesktop.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/grains.py
@@ -302,6 +367,10 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/guestfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/hadoop.py
 %%PYTHON_SITELIBDIR%%/salt/modules/hadoop.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/haproxyconn.py
+%%PYTHON_SITELIBDIR%%/salt/modules/haproxyconn.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/hashutil.py
+%%PYTHON_SITELIBDIR%%/salt/modules/hashutil.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/hg.py
 %%PYTHON_SITELIBDIR%%/salt/modules/hg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/hosts.py
@@ -312,6 +381,14 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/img.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/incron.py
 %%PYTHON_SITELIBDIR%%/salt/modules/incron.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/influx.py
+%%PYTHON_SITELIBDIR%%/salt/modules/influx.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/ini_manage.py
+%%PYTHON_SITELIBDIR%%/salt/modules/ini_manage.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/introspect.py
+%%PYTHON_SITELIBDIR%%/salt/modules/introspect.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/ipset.py
+%%PYTHON_SITELIBDIR%%/salt/modules/ipset.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/iptables.py
 %%PYTHON_SITELIBDIR%%/salt/modules/iptables.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/junos.py
@@ -340,6 +417,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/localemod.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/locate.py
 %%PYTHON_SITELIBDIR%%/salt/modules/locate.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/logadm.py
+%%PYTHON_SITELIBDIR%%/salt/modules/logadm.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/logrotate.py
 %%PYTHON_SITELIBDIR%%/salt/modules/logrotate.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/lvs.py
@@ -350,6 +429,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/mac_group.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/mac_user.py
 %%PYTHON_SITELIBDIR%%/salt/modules/mac_user.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/macports.py
+%%PYTHON_SITELIBDIR%%/salt/modules/macports.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/makeconf.py
 %%PYTHON_SITELIBDIR%%/salt/modules/makeconf.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/match.py
@@ -360,6 +441,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/memcached.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/mine.py
 %%PYTHON_SITELIBDIR%%/salt/modules/mine.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/mod_random.py
+%%PYTHON_SITELIBDIR%%/salt/modules/mod_random.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/modjk.py
 %%PYTHON_SITELIBDIR%%/salt/modules/modjk.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/mongodb.py
@@ -374,6 +457,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/munin.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/mysql.py
 %%PYTHON_SITELIBDIR%%/salt/modules/mysql.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/nagios.py
+%%PYTHON_SITELIBDIR%%/salt/modules/nagios.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/netbsd_sysctl.py
 %%PYTHON_SITELIBDIR%%/salt/modules/netbsd_sysctl.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/netbsdservice.py
@@ -382,6 +467,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/network.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/nfs3.py
 %%PYTHON_SITELIBDIR%%/salt/modules/nfs3.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/nftables.py
+%%PYTHON_SITELIBDIR%%/salt/modules/nftables.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/nginx.py
 %%PYTHON_SITELIBDIR%%/salt/modules/nginx.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/nova.py
@@ -396,6 +483,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/openbsdservice.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/openstack_config.py
 %%PYTHON_SITELIBDIR%%/salt/modules/openstack_config.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/oracle.py
+%%PYTHON_SITELIBDIR%%/salt/modules/oracle.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/osxdesktop.py
 %%PYTHON_SITELIBDIR%%/salt/modules/osxdesktop.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/pacman.py
@@ -422,6 +511,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/pkgutil.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/portage_config.py
 %%PYTHON_SITELIBDIR%%/salt/modules/portage_config.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/postfix.py
+%%PYTHON_SITELIBDIR%%/salt/modules/postfix.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/postgres.py
 %%PYTHON_SITELIBDIR%%/salt/modules/postgres.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/poudriere.py
@@ -438,6 +529,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/pw_group.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/pw_user.py
 %%PYTHON_SITELIBDIR%%/salt/modules/pw_user.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/pyenv.py
+%%PYTHON_SITELIBDIR%%/salt/modules/pyenv.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/qemu_img.py
 %%PYTHON_SITELIBDIR%%/salt/modules/qemu_img.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/qemu_nbd.py
@@ -446,10 +539,14 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/quota.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rabbitmq.py
 %%PYTHON_SITELIBDIR%%/salt/modules/rabbitmq.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/raet_publish.py
+%%PYTHON_SITELIBDIR%%/salt/modules/raet_publish.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rbenv.py
 %%PYTHON_SITELIBDIR%%/salt/modules/rbenv.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rdp.py
 %%PYTHON_SITELIBDIR%%/salt/modules/rdp.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/redismod.py
+%%PYTHON_SITELIBDIR%%/salt/modules/redismod.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/reg.py
 %%PYTHON_SITELIBDIR%%/salt/modules/reg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rest_package.py
@@ -478,10 +575,16 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/saltcloudmod.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/saltutil.py
 %%PYTHON_SITELIBDIR%%/salt/modules/saltutil.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/schedule.py
+%%PYTHON_SITELIBDIR%%/salt/modules/schedule.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/seed.py
 %%PYTHON_SITELIBDIR%%/salt/modules/seed.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/selinux.py
 %%PYTHON_SITELIBDIR%%/salt/modules/selinux.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/sensors.py
+%%PYTHON_SITELIBDIR%%/salt/modules/sensors.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/serverdensity_device.py
+%%PYTHON_SITELIBDIR%%/salt/modules/serverdensity_device.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/service.py
 %%PYTHON_SITELIBDIR%%/salt/modules/service.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/shadow.py
@@ -492,6 +595,10 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/smartos_vmadm.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/smf.py
 %%PYTHON_SITELIBDIR%%/salt/modules/smf.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/smtp.py
+%%PYTHON_SITELIBDIR%%/salt/modules/smtp.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/softwareupdate.py
+%%PYTHON_SITELIBDIR%%/salt/modules/softwareupdate.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/solaris_group.py
 %%PYTHON_SITELIBDIR%%/salt/modules/solaris_group.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/solaris_shadow.py
@@ -514,6 +621,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/supervisord.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/svn.py
 %%PYTHON_SITELIBDIR%%/salt/modules/svn.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/swift.py
+%%PYTHON_SITELIBDIR%%/salt/modules/swift.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/sysbench.py
 %%PYTHON_SITELIBDIR%%/salt/modules/sysbench.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/sysmod.py
@@ -530,10 +639,16 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/tls.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/tomcat.py
 %%PYTHON_SITELIBDIR%%/salt/modules/tomcat.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/twilio_notify.py
+%%PYTHON_SITELIBDIR%%/salt/modules/twilio_notify.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/upstart.py
 %%PYTHON_SITELIBDIR%%/salt/modules/upstart.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/useradd.py
 %%PYTHON_SITELIBDIR%%/salt/modules/useradd.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/uwsgi.py
+%%PYTHON_SITELIBDIR%%/salt/modules/uwsgi.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/varnish.py
+%%PYTHON_SITELIBDIR%%/salt/modules/varnish.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/virt.py
 %%PYTHON_SITELIBDIR%%/salt/modules/virt.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/virtualenv_mod.py
@@ -574,6 +689,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/win_system.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/win_timezone.py
 %%PYTHON_SITELIBDIR%%/salt/modules/win_timezone.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/win_update.py
+%%PYTHON_SITELIBDIR%%/salt/modules/win_update.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/win_useradd.py
 %%PYTHON_SITELIBDIR%%/salt/modules/win_useradd.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/xapi.py
@@ -586,12 +703,40 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/zcbuildout.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/zfs.py
 %%PYTHON_SITELIBDIR%%/salt/modules/zfs.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/znc.py
+%%PYTHON_SITELIBDIR%%/salt/modules/znc.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/zpool.py
 %%PYTHON_SITELIBDIR%%/salt/modules/zpool.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/zypper.py
 %%PYTHON_SITELIBDIR%%/salt/modules/zypper.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/app.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/app.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/event_processor.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/event_processor.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/tools/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/tools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/tools/websockets.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/tools/websockets.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/wsgi.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_cherrypy/wsgi.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/event_processor.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/event_processor.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado_websockets.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_tornado/saltnado_websockets.pyc
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_wsgi.py
+%%PYTHON_SITELIBDIR%%/salt/netapi/rest_wsgi.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/output/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/output/compact.py
+%%PYTHON_SITELIBDIR%%/salt/output/compact.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/grains.py
 %%PYTHON_SITELIBDIR%%/salt/output/grains.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/highstate.py
@@ -602,6 +747,8 @@
 %%PYTHON_SITELIBDIR%%/salt/output/key.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/nested.py
 %%PYTHON_SITELIBDIR%%/salt/output/nested.pyc
+%%PYTHON_SITELIBDIR%%/salt/output/newline_values_only.py
+%%PYTHON_SITELIBDIR%%/salt/output/newline_values_only.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/no_out.py
 %%PYTHON_SITELIBDIR%%/salt/output/no_out.pyc
 %%PYTHON_SITELIBDIR%%/salt/output/no_return.py
@@ -628,10 +775,16 @@
 %%PYTHON_SITELIBDIR%%/salt/pillar/cmd_json.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/cmd_yaml.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/cmd_yaml.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/cmd_yamlex.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/cmd_yamlex.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/cobbler.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/cobbler.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/django_orm.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/django_orm.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/etcd_pillar.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/etcd_pillar.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/foreman.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/foreman.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/git_pillar.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/git_pillar.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/hiera.py
@@ -642,50 +795,84 @@
 %%PYTHON_SITELIBDIR%%/salt/pillar/mongo.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/mysql.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/mysql.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/pepa.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/pepa.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/pillar_ldap.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/pillar_ldap.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/puppet.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/puppet.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/reclass_adapter.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/reclass_adapter.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/redismod.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/redismod.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/s3.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/s3.pyc
+%%PYTHON_SITELIBDIR%%/salt/pillar/svn_pillar.py
+%%PYTHON_SITELIBDIR%%/salt/pillar/svn_pillar.pyc
 %%PYTHON_SITELIBDIR%%/salt/pillar/virtkey.py
 %%PYTHON_SITELIBDIR%%/salt/pillar/virtkey.pyc
+%%PYTHON_SITELIBDIR%%/salt/proxy/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/proxy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/proxy/junos.py
+%%PYTHON_SITELIBDIR%%/salt/proxy/junos.pyc
+%%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.py
+%%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/renderers/gpg.py
+%%PYTHON_SITELIBDIR%%/salt/renderers/gpg.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/jinja.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/jinja.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/json.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/json.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/mako.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/mako.pyc
+%%PYTHON_SITELIBDIR%%/salt/renderers/msgpack.py
+%%PYTHON_SITELIBDIR%%/salt/renderers/msgpack.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/py.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/py.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/pydsl.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/pydsl.pyc
+%%PYTHON_SITELIBDIR%%/salt/renderers/pyobjects.py
+%%PYTHON_SITELIBDIR%%/salt/renderers/pyobjects.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/stateconf.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/stateconf.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/wempy.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/wempy.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/yaml.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/yaml.pyc
+%%PYTHON_SITELIBDIR%%/salt/renderers/yamlex.py
+%%PYTHON_SITELIBDIR%%/salt/renderers/yamlex.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/returners/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/carbon_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/carbon_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/cassandra_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/cassandra_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/couchbase_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/couchbase_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/couchdb_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/couchdb_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/elasticsearch_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/elasticsearch_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/etcd_return.py
+%%PYTHON_SITELIBDIR%%/salt/returners/etcd_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/local.py
 %%PYTHON_SITELIBDIR%%/salt/returners/local.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/local_cache.py
+%%PYTHON_SITELIBDIR%%/salt/returners/local_cache.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/memcache_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/memcache_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/mongo_future_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/mongo_future_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/mongo_return.py
 %%PYTHON_SITELIBDIR%%/salt/returners/mongo_return.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/multi_returner.py
+%%PYTHON_SITELIBDIR%%/salt/returners/multi_returner.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/mysql.py
 %%PYTHON_SITELIBDIR%%/salt/returners/mysql.pyc
+%%PYTHON_SITELIBDIR%%/salt/returners/odbc.py
+%%PYTHON_SITELIBDIR%%/salt/returners/odbc.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/postgres.py
 %%PYTHON_SITELIBDIR%%/salt/returners/postgres.pyc
 %%PYTHON_SITELIBDIR%%/salt/returners/redis_return.py
@@ -700,6 +887,10 @@
 %%PYTHON_SITELIBDIR%%/salt/returners/syslog_return.pyc
 %%PYTHON_SITELIBDIR%%/salt/roster/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/roster/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/roster/ansible.py
+%%PYTHON_SITELIBDIR%%/salt/roster/ansible.pyc
+%%PYTHON_SITELIBDIR%%/salt/roster/cache.py
+%%PYTHON_SITELIBDIR%%/salt/roster/cache.pyc
 %%PYTHON_SITELIBDIR%%/salt/roster/flat.py
 %%PYTHON_SITELIBDIR%%/salt/roster/flat.pyc
 %%PYTHON_SITELIBDIR%%/salt/roster/scan.py
@@ -734,10 +925,16 @@
 %%PYTHON_SITELIBDIR%%/salt/runners/network.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/pillar.py
 %%PYTHON_SITELIBDIR%%/salt/runners/pillar.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/queue.py
+%%PYTHON_SITELIBDIR%%/salt/runners/queue.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/search.py
 %%PYTHON_SITELIBDIR%%/salt/runners/search.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/state.py
 %%PYTHON_SITELIBDIR%%/salt/runners/state.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/survey.py
+%%PYTHON_SITELIBDIR%%/salt/runners/survey.pyc
+%%PYTHON_SITELIBDIR%%/salt/runners/test.py
+%%PYTHON_SITELIBDIR%%/salt/runners/test.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/thin.py
 %%PYTHON_SITELIBDIR%%/salt/runners/thin.pyc
 %%PYTHON_SITELIBDIR%%/salt/runners/virt.py
@@ -758,6 +955,10 @@
 %%PYTHON_SITELIBDIR%%/salt/states/alias.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/alternatives.py
 %%PYTHON_SITELIBDIR%%/salt/states/alternatives.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/apache.py
+%%PYTHON_SITELIBDIR%%/salt/states/apache.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/apache_module.py
+%%PYTHON_SITELIBDIR%%/salt/states/apache_module.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/apt.py
 %%PYTHON_SITELIBDIR%%/salt/states/apt.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/archive.py
@@ -768,6 +969,26 @@
 %%PYTHON_SITELIBDIR%%/salt/states/augeas.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/aws_sqs.py
 %%PYTHON_SITELIBDIR%%/salt/states/aws_sqs.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/blockdev.py
+%%PYTHON_SITELIBDIR%%/salt/states/blockdev.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_asg.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_asg.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_cloudwatch_alarm.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_cloudwatch_alarm.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_elasticache.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_elasticache.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_elb.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_elb.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_iam_role.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_iam_role.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_lc.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_lc.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_route53.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_route53.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_secgroup.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_secgroup.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/boto_sqs.py
+%%PYTHON_SITELIBDIR%%/salt/states/boto_sqs.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/cloud.py
 %%PYTHON_SITELIBDIR%%/salt/states/cloud.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/cmd.py
@@ -784,14 +1005,20 @@
 %%PYTHON_SITELIBDIR%%/salt/states/disk.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/dockerio.py
 %%PYTHON_SITELIBDIR%%/salt/states/dockerio.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/environ.py
+%%PYTHON_SITELIBDIR%%/salt/states/environ.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/eselect.py
 %%PYTHON_SITELIBDIR%%/salt/states/eselect.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/event.py
+%%PYTHON_SITELIBDIR%%/salt/states/event.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/file.py
 %%PYTHON_SITELIBDIR%%/salt/states/file.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/gem.py
 %%PYTHON_SITELIBDIR%%/salt/states/gem.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/git.py
 %%PYTHON_SITELIBDIR%%/salt/states/git.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/glusterfs.py
+%%PYTHON_SITELIBDIR%%/salt/states/glusterfs.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/gnomedesktop.py
 %%PYTHON_SITELIBDIR%%/salt/states/gnomedesktop.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/grains.py
@@ -802,8 +1029,18 @@
 %%PYTHON_SITELIBDIR%%/salt/states/hg.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/host.py
 %%PYTHON_SITELIBDIR%%/salt/states/host.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/htpasswd.py
+%%PYTHON_SITELIBDIR%%/salt/states/htpasswd.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/incron.py
 %%PYTHON_SITELIBDIR%%/salt/states/incron.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/influxdb_database.py
+%%PYTHON_SITELIBDIR%%/salt/states/influxdb_database.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/influxdb_user.py
+%%PYTHON_SITELIBDIR%%/salt/states/influxdb_user.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/ini_manage.py
+%%PYTHON_SITELIBDIR%%/salt/states/ini_manage.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/ipset.py
+%%PYTHON_SITELIBDIR%%/salt/states/ipset.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/iptables.py
 %%PYTHON_SITELIBDIR%%/salt/states/iptables.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/keyboard.py
@@ -824,12 +1061,16 @@
 %%PYTHON_SITELIBDIR%%/salt/states/lvs_server.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/lvs_service.py
 %%PYTHON_SITELIBDIR%%/salt/states/lvs_service.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/lxc.py
+%%PYTHON_SITELIBDIR%%/salt/states/lxc.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/makeconf.py
 %%PYTHON_SITELIBDIR%%/salt/states/makeconf.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/mdadm.py
 %%PYTHON_SITELIBDIR%%/salt/states/mdadm.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/memcached.py
 %%PYTHON_SITELIBDIR%%/salt/states/memcached.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/modjk.py
+%%PYTHON_SITELIBDIR%%/salt/states/modjk.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/modjk_worker.py
 %%PYTHON_SITELIBDIR%%/salt/states/modjk_worker.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/module.py
@@ -844,10 +1085,14 @@
 %%PYTHON_SITELIBDIR%%/salt/states/mysql_database.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/mysql_grants.py
 %%PYTHON_SITELIBDIR%%/salt/states/mysql_grants.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/mysql_query.py
+%%PYTHON_SITELIBDIR%%/salt/states/mysql_query.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/mysql_user.py
 %%PYTHON_SITELIBDIR%%/salt/states/mysql_user.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/network.py
 %%PYTHON_SITELIBDIR%%/salt/states/network.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/nftables.py
+%%PYTHON_SITELIBDIR%%/salt/states/nftables.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/npm.py
 %%PYTHON_SITELIBDIR%%/salt/states/npm.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ntp.py
@@ -872,6 +1117,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/ports.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_database.py
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_database.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/postgres_extension.py
+%%PYTHON_SITELIBDIR%%/salt/states/postgres_extension.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_group.py
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_group.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/postgres_user.py
@@ -880,6 +1127,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/powerpath.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/process.py
 %%PYTHON_SITELIBDIR%%/salt/states/process.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/pyenv.py
+%%PYTHON_SITELIBDIR%%/salt/states/pyenv.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/quota.py
 %%PYTHON_SITELIBDIR%%/salt/states/quota.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/rabbitmq_cluster.py
@@ -896,16 +1145,24 @@
 %%PYTHON_SITELIBDIR%%/salt/states/rbenv.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/rdp.py
 %%PYTHON_SITELIBDIR%%/salt/states/rdp.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/redismod.py
+%%PYTHON_SITELIBDIR%%/salt/states/redismod.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/reg.py
 %%PYTHON_SITELIBDIR%%/salt/states/reg.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/rvm.py
 %%PYTHON_SITELIBDIR%%/salt/states/rvm.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/saltmod.py
 %%PYTHON_SITELIBDIR%%/salt/states/saltmod.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/schedule.py
+%%PYTHON_SITELIBDIR%%/salt/states/schedule.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/selinux.py
 %%PYTHON_SITELIBDIR%%/salt/states/selinux.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/serverdensity_device.py
+%%PYTHON_SITELIBDIR%%/salt/states/serverdensity_device.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/service.py
 %%PYTHON_SITELIBDIR%%/salt/states/service.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/smtp.py
+%%PYTHON_SITELIBDIR%%/salt/states/smtp.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ssh_auth.py
 %%PYTHON_SITELIBDIR%%/salt/states/ssh_auth.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/ssh_known_hosts.py
@@ -920,6 +1177,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/svn.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/sysctl.py
 %%PYTHON_SITELIBDIR%%/salt/states/sysctl.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/test.py
+%%PYTHON_SITELIBDIR%%/salt/states/test.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/timezone.py
 %%PYTHON_SITELIBDIR%%/salt/states/timezone.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/tomcat.py
@@ -940,19 +1199,30 @@
 %%PYTHON_SITELIBDIR%%/salt/states/win_servermanager.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/win_system.py
 %%PYTHON_SITELIBDIR%%/salt/states/win_system.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/win_update.py
+%%PYTHON_SITELIBDIR%%/salt/states/win_update.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/winrepo.py
+%%PYTHON_SITELIBDIR%%/salt/states/winrepo.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/xmpp.py
 %%PYTHON_SITELIBDIR%%/salt/states/xmpp.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/zcbuildout.py
 %%PYTHON_SITELIBDIR%%/salt/states/zcbuildout.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/zk_concurrency.py
+%%PYTHON_SITELIBDIR%%/salt/states/zk_concurrency.pyc
 %%PYTHON_SITELIBDIR%%/salt/syspaths.py
 %%PYTHON_SITELIBDIR%%/salt/syspaths.pyc
 %%PYTHON_SITELIBDIR%%/salt/template.py
 %%PYTHON_SITELIBDIR%%/salt/template.pyc
+%%PYTHON_SITELIBDIR%%/salt/templates/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/templates/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip/conf.jinja
 %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip/debian_eth.jinja
+%%PYTHON_SITELIBDIR%%/salt/templates/debian_ip/debian_ppp_eth.jinja
 %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip/display-network.jinja
 %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip/network.jinja
 %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip/route_eth.jinja
+%%PYTHON_SITELIBDIR%%/salt/templates/git/ssh-id-wrapper
+%%PYTHON_SITELIBDIR%%/salt/templates/lxc/salt_tarball
 %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip/conf.jinja
 %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip/network.jinja
 %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip/rh5_eth.jinja
@@ -975,8 +1245,14 @@
 %%PYTHON_SITELIBDIR%%/salt/transport/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/utils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/aggregation.py
+%%PYTHON_SITELIBDIR%%/salt/utils/aggregation.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/args.py
+%%PYTHON_SITELIBDIR%%/salt/utils/args.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/atomicfile.py
 %%PYTHON_SITELIBDIR%%/salt/utils/atomicfile.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/cache.py
+%%PYTHON_SITELIBDIR%%/salt/utils/cache.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/cloud.py
 %%PYTHON_SITELIBDIR%%/salt/utils/cloud.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/context.py
@@ -987,16 +1263,28 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/decorators/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/dictupdate.py
 %%PYTHON_SITELIBDIR%%/salt/utils/dictupdate.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/doc.py
+%%PYTHON_SITELIBDIR%%/salt/utils/doc.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/error.py
 %%PYTHON_SITELIBDIR%%/salt/utils/error.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/etcd_util.py
+%%PYTHON_SITELIBDIR%%/salt/utils/etcd_util.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/event.py
 %%PYTHON_SITELIBDIR%%/salt/utils/event.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/filebuffer.py
 %%PYTHON_SITELIBDIR%%/salt/utils/filebuffer.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/files.py
+%%PYTHON_SITELIBDIR%%/salt/utils/files.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/find.py
 %%PYTHON_SITELIBDIR%%/salt/utils/find.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/github.py
+%%PYTHON_SITELIBDIR%%/salt/utils/github.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/gzip_util.py
 %%PYTHON_SITELIBDIR%%/salt/utils/gzip_util.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/iam.py
+%%PYTHON_SITELIBDIR%%/salt/utils/iam.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/immutabletypes.py
+%%PYTHON_SITELIBDIR%%/salt/utils/immutabletypes.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/ipaddr.py
 %%PYTHON_SITELIBDIR%%/salt/utils/ipaddr.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/jinja.py
@@ -1007,6 +1295,8 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/master.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/migrations.py
 %%PYTHON_SITELIBDIR%%/salt/utils/migrations.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/minion.py
+%%PYTHON_SITELIBDIR%%/salt/utils/minion.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/minions.py
 %%PYTHON_SITELIBDIR%%/salt/utils/minions.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/nb_popen.py
@@ -1015,12 +1305,26 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/network.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/odict.py
 %%PYTHON_SITELIBDIR%%/salt/utils/odict.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/nova.py
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/nova.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/swift.py
+%%PYTHON_SITELIBDIR%%/salt/utils/openstack/swift.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/pagerduty.py
+%%PYTHON_SITELIBDIR%%/salt/utils/pagerduty.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/parsers.py
 %%PYTHON_SITELIBDIR%%/salt/utils/parsers.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/process.py
 %%PYTHON_SITELIBDIR%%/salt/utils/process.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/pycrypto.py
+%%PYTHON_SITELIBDIR%%/salt/utils/pycrypto.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/pydsl.py
 %%PYTHON_SITELIBDIR%%/salt/utils/pydsl.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/pyobjects.py
+%%PYTHON_SITELIBDIR%%/salt/utils/pyobjects.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/raetevent.py
+%%PYTHON_SITELIBDIR%%/salt/utils/raetevent.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/reclass.py
 %%PYTHON_SITELIBDIR%%/salt/utils/reclass.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/s3.py
@@ -1029,6 +1333,20 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/schedule.py
 %%PYTHON_SITELIBDIR%%/salt/utils/schedule.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/sdb.py
+%%PYTHON_SITELIBDIR%%/salt/utils/sdb.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/json.py
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/json.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/msgpack.py
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/msgpack.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/yaml.py
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/yaml.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/yamlex.py
+%%PYTHON_SITELIBDIR%%/salt/utils/serializers/yamlex.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/smtp.py
+%%PYTHON_SITELIBDIR%%/salt/utils/smtp.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/templates.py
 %%PYTHON_SITELIBDIR%%/salt/utils/templates.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/thin.py
@@ -1055,6 +1373,8 @@
 %%PYTHON_SITELIBDIR%%/salt/utils/winapi.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/winservice.py
 %%PYTHON_SITELIBDIR%%/salt/utils/winservice.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/xdg.py
+%%PYTHON_SITELIBDIR%%/salt/utils/xdg.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/xmlutil.py
 %%PYTHON_SITELIBDIR%%/salt/utils/xmlutil.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/yamldumper.py
@@ -1075,6 +1395,53 @@
 %%PYTHON_SITELIBDIR%%/salt/wheel/key.pyc
 %%PYTHON_SITELIBDIR%%/salt/wheel/pillar_roots.py
 %%PYTHON_SITELIBDIR%%/salt/wheel/pillar_roots.pyc
+@dir %%PYTHON_SITELIBDIR%%/salt
+@dir %%PYTHON_SITELIBDIR%%/salt/auth
+@dir %%PYTHON_SITELIBDIR%%/salt/cli
+@dir %%PYTHON_SITELIBDIR%%/salt/client
+@dir %%PYTHON_SITELIBDIR%%/salt/client/ssh
+@dir %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper
+@dir %%PYTHON_SITELIBDIR%%/salt/cloud
+@dir %%PYTHON_SITELIBDIR%%/salt/cloud/clouds
+@dir %%PYTHON_SITELIBDIR%%/salt/cloud/deploy
+@dir %%PYTHON_SITELIBDIR%%/salt/ext
+@dir %%PYTHON_SITELIBDIR%%/salt/fileserver
+@dir %%PYTHON_SITELIBDIR%%/salt/grains
+@dir %%PYTHON_SITELIBDIR%%/salt/log
+@dir %%PYTHON_SITELIBDIR%%/salt/log/handlers
+@dir %%PYTHON_SITELIBDIR%%/salt/modules
+@dir %%PYTHON_SITELIBDIR%%/salt/output
+@dir %%PYTHON_SITELIBDIR%%/salt/pillar
+@dir %%PYTHON_SITELIBDIR%%/salt/renderers
+@dir %%PYTHON_SITELIBDIR%%/salt/returners
+@dir %%PYTHON_SITELIBDIR%%/salt/roster
+@dir %%PYTHON_SITELIBDIR%%/salt/runners
+@dir %%PYTHON_SITELIBDIR%%/salt/search
+@dir %%PYTHON_SITELIBDIR%%/salt/states
+@dir %%PYTHON_SITELIBDIR%%/salt/templates
+@dir %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip
+@dir %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip
+@dir %%PYTHON_SITELIBDIR%%/salt/templates/virt
+@dir %%PYTHON_SITELIBDIR%%/salt/tops
+@dir %%PYTHON_SITELIBDIR%%/salt/transport
+@dir %%PYTHON_SITELIBDIR%%/salt/utils
+@dir %%PYTHON_SITELIBDIR%%/salt/utils/decorators
+@dir %%PYTHON_SITELIBDIR%%/salt/utils/validate
+@dir %%PYTHON_SITELIBDIR%%/salt/wheel
+@dirrmtry %%ETCDIR%%
+bin/salt
+bin/salt-api
+bin/salt-call
+bin/salt-cloud
+bin/salt-cp
+bin/salt-key
+bin/salt-master
+bin/salt-minion
+bin/salt-run
+bin/salt-ssh
+bin/salt-syndic
+bin/salt-unity
+man/man1/salt-api.1.gz
 man/man1/salt-call.1.gz
 man/man1/salt-cloud.1.gz
 man/man1/salt-cp.1.gz
@@ -1084,39 +1451,6 @@
 man/man1/salt-run.1.gz
 man/man1/salt-ssh.1.gz
 man/man1/salt-syndic.1.gz
+man/man1/salt-unity.1.gz
 man/man1/salt.1.gz
 man/man7/salt.7.gz
-@dirrmtry %%ETCDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/salt/auth
-@dirrm %%PYTHON_SITELIBDIR%%/salt/cli
-@dirrm %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper
-@dirrm %%PYTHON_SITELIBDIR%%/salt/client/ssh
-@dirrm %%PYTHON_SITELIBDIR%%/salt/client
-@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/clouds
-@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/deploy
-@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud
-@dirrm %%PYTHON_SITELIBDIR%%/salt/ext
-@dirrm %%PYTHON_SITELIBDIR%%/salt/fileserver
-@dirrm %%PYTHON_SITELIBDIR%%/salt/grains
-@dirrm %%PYTHON_SITELIBDIR%%/salt/log/handlers
-@dirrm %%PYTHON_SITELIBDIR%%/salt/log
-@dirrm %%PYTHON_SITELIBDIR%%/salt/modules
-@dirrm %%PYTHON_SITELIBDIR%%/salt/output
-@dirrm %%PYTHON_SITELIBDIR%%/salt/pillar
-@dirrm %%PYTHON_SITELIBDIR%%/salt/renderers
-@dirrm %%PYTHON_SITELIBDIR%%/salt/returners
-@dirrm %%PYTHON_SITELIBDIR%%/salt/roster
-@dirrm %%PYTHON_SITELIBDIR%%/salt/runners
-@dirrm %%PYTHON_SITELIBDIR%%/salt/search
-@dirrm %%PYTHON_SITELIBDIR%%/salt/states
-@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip
-@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip
-@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/virt
-@dirrm %%PYTHON_SITELIBDIR%%/salt/templates
-@dirrm %%PYTHON_SITELIBDIR%%/salt/tops
-@dirrm %%PYTHON_SITELIBDIR%%/salt/transport
-@dirrm %%PYTHON_SITELIBDIR%%/salt/utils/decorators
-@dirrm %%PYTHON_SITELIBDIR%%/salt/utils/validate
-@dirrm %%PYTHON_SITELIBDIR%%/salt/utils
-@dirrm %%PYTHON_SITELIBDIR%%/salt/wheel
-@dirrm %%PYTHON_SITELIBDIR%%/salt