Updates from Django 1.4 to Django 1.6

Years have passed!

See:
* https://docs.djangoproject.com/en/1.5/releases/1.5/#backwards-incompatible-changes-in-1-5
* https://docs.djangoproject.com/en/1.6/releases/1.6/#backwards-incompatible-changes-in-1-6