Drop six back out, we get it with Django
Merge pull request #29 from d0ugal/tox

Drop six back out, we get it with Django