Upgrading to Django 1.7