fix for running with django 1.5
Merge pull request #23 from teran/django-1.5

fix for running with django 1.5
Merge remote-tracking branch 'upstream/master'