Use Django-internal six copy
Merge pull request #16 from gidoca/master

Use Django-internal six copy