Django 1.7
Merge pull request #2 from ccnmtl/django-1.7

Django 1.7

After a week waiting for code review, I'm just merging these myself.