Django 1.7.1
Merge pull request #6 from ccnmtl/django-1.7

Django 1.7