Vendor six at version 1.8.0
Update the requirements and setup.py
Change rewording of import six
Merge pull request #411 from kyleknap/vendor-six

Vendor six to 1.8.0