Django 1.5 compatibility changes
Merge pull request #3 from ebradbury/master

Django 1.5 compatibility changes