Updates for upgrading to Django 1.6