Upgraded to Django 1.7
Merge pull request #41 from edx/django-1.7

Upgraded to Django 1.7