Remove unused versions of ‘six’
Merge pull request #489 from astrofrog/remove-six

Remove unused versions of ‘six’