Updated six to use six vendored in botocore
Switch many of the files to new six format
Merge pull request #1057 from kyleknap/vendor-six

Use botocore vendoring of six