setup.py buggy findpackage removed and manifest updated for user_model

MANIFEST.in

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

setup.py

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