Django 1.5 compatibility fixes
Update setup.py
PEP8 clean up
Merge pull request #102 from huxley/master

PEP8 clean up to import changes for forward compatibility with Django 1.5+