Changing setup.py to avoid conflicts between master and devel

Author: pavanky

setup.py

@@ -15,11 +15,16 @@
 ## 1) Look for af libraries during setup
 ## 2) Include test suite
 
+# Some hackery to avoid merge conflicts between master and devel
+current_version = "3.3.20160320"
+devel_version = "3.3.0"
+release_version = current_version if current_version > devel_version else devel_version
+
 setup(
     author="Pavan Yalamanchili",
     author_email="pavan@arrayfire.com",
     name="arrayfire",
-    version="3.3.20160320",
+    version=release_version
     description="Python bindings for ArrayFire",
     license="BSD",
     url="http://arrayfire.com",