use six shipped with django
Merge pull request #40 from sir-sigurd/use-django-six

use six shipped with django