Import six from django.utils, fixes #112
Merge pull request #113 from Purpwood/master

Import six from django.utils, fixes #112