Django 1.7 update.
Merge pull request #26 from robhudson/django-1.7

Django 1.7 update.