Changes for Django 1.5.1
Merge pull request #69 from dpoirier/django-1.5.1

Changes for Django 1.5.1