Fixing setup.py, geez I'm not doing awesome today
Fixing setup.py again...sigh
Merge branch 'master' of github.com:frankwiles/django-admin-views