putting fix-setup-py.patch into git instead of lookaside

.gitignore

@@ -42,4 +42,3 @@
 /salt-syndic
 /salt-syndic.service
 /salt-2014.1.3.tar.gz
-/fix-setup-py.patch

fix-setup-py.patch

@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 6feb5d0..6b08e12 100755
+--- a/setup.py
++++ b/setup.py
+@@ -513,7 +513,7 @@ FREEZER_INCLUDES = [
+     'email.mime.*',
+ ]
+ 
+-if hasattr(zmq, 'pyzmq_version_info'):
++if HAS_ZMQ and hasattr(zmq, 'pyzmq_version_info'):
+     if HAS_ZMQ and zmq.pyzmq_version_info() >= (0, 14):
+         # We're freezing, and when freezing ZMQ needs to be installed, so this
+         # works fine

sources

@@ -7,4 +7,3 @@ f66118a624fc7cbc5bcf01051c69e83a  salt-master.service
 8ef6ab9bf9750f146d31bd8da9da963b  salt-minion.service
 9dd4f6cdd608f8bca63f9a5b7655073b  salt-syndic
 97e1daa0f7232f48d109b62890b68d0e  salt-syndic.service
-ae758da300e33cab7dd797709fe0982a  fix-setup-py.patch