PEP8 fixups
Stick to Django convention instead of PEP8
Add Django 1.5, 1.6 support
Merge pull request #4 from GotenXiao/pep8

PEP8 fixups
Remove assert line from import
Merge pull request #5 from GotenXiao/django-1.5

Add Django 1.5, 1.6 support