Updates to Django 1.5