Merge pull request #68 from drfloob/master

cleanup / fix setup.py, and add license

setup.py

@@ -6,22 +6,20 @@
 
 from setuptools import setup
 
-import re
 import os
-import requests
 
 os.environ['COPY_EXTENDED_ATTRIBUTES_DISABLE'] = 'true'
 os.environ['COPYFILE_DISABLE'] = 'true'
 
 
 setup(name='pyhaystack',
       version=info.__version__,
-	 description='Python Haystack Utility',
+      description='Python Haystack Utility',
       author=info.__author__,
       author_email=info.__author_email__,
       url='http://www.project-haystack.com/',
       keywords = ['tags', 'hvac', 'project-haystack', 'building', 'automation', 'analytic'],
-	 install_requires = [
+      install_requires = [
           'requests',
           'setuptools',
           'pandas',
@@ -51,9 +49,6 @@
           'pyhaystack.util',
           'pyhaystack.server',
           'pyhaystack.util'],
-#      entry_points={
-#          'console_scripts': ['pyhaystack=pyhaystack:main'],
-#     },
       long_description=open('README.rst').read(),
       classifiers=[
           "Development Status :: 4 - Beta",
@@ -63,4 +58,5 @@
           "Topic :: Software Development :: Libraries :: Python Modules",
           "Topic :: System :: Networking",
           "Topic :: Utilities",
+          "License :: OSI Approved :: Apache Software License",
           ],)