Django 1.5

Building off of Loek's pull request for the Django 1.5 update.