Add support for Django version of six
Merge pull request #40 from dekkers/django-six

Add support for Django version of six