Revert "setup.py buggy findpackage removed and manifest updated for user_model"

This reverts commit 9d708f48c5.

MANIFEST.in

@@ -3,4 +3,3 @@ recursive-include tests *
 recursive-include tools *
 recursive-include user_libs *
 global-exclude *.DS_Store
-recursive-include user_models *

setup.py

@@ -165,9 +165,10 @@ if USE_CYTHON:
                            },
                            annotate=False)
 
+# SetupTools Required to make package
+import setuptools
 
-setup(
+setup(name=packagename,
-      name=packagename,
       version=version,
       author='Craig Warren and Antonis Giannopoulos',
       url='http://www.gprmax.com',