Upgraded to Django 1.7