setup
Merge pull request #1081 from SiggyF/fedor-setup-installrequires

Move six into install_requires