update for django 1.6
Merge pull request #3 from quietlyconfident/master

Fix for Django 1.6