Merge branch 'develop'

Author: dstegelman

MANIFEST.in

@@ -1,3 +1,6 @@
 include LICENSE.mit
 include README.md
+include CHANGELOG.md
+include AUTHORS
+include CONTRIBUTORS
 recursive-exclude * *.pyc

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1

setup.py

@@ -17,17 +17,22 @@ def read(fname):
           "Development Status :: 5 - Production/Stable",
           "Environment :: Web Environment",
           "Framework :: Django",
+          "Framework :: Django :: 1.5",
+          "Framework :: Django :: 1.6",
+          "Framework :: Django :: 1.7",
           "Intended Audience :: Developers",
           "Natural Language :: English",
           "Operating System :: OS Independent",
           "Programming Language :: Python",
+          "Programming Language :: Python :: 3",
+          "Programming Language :: Python :: 2",
           "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
           "Topic :: Utilities",
           "License :: OSI Approved :: MIT License",
           ],
       keywords='django cas',
       author='Derek Stegelman, Garrett Pennington',
-      author_email='derekst@k-state.edu, garrett@k-state.edu',
+      author_email='derekst@k-state.edu, garrettp@gmail.com',
       url='http://github.com/kstateome/django-cas/',
       license='MIT',
       packages=find_packages(),