Fixes for running under django 1.6
Merge pull request #36 from gordon-morehouse/chore/django-1.6

Fixes for running under django 1.6