Updated to Django 1.7