Upgrade six to 1.7.3
Merge pull request #2006 from dstufft/upgrade-six

Upgrade six to 1.7.3