Upgrade versions of six/unittest2

Confirmed there are no issues.  Six upgrade is a backwards
compatible change, and we can now use unittest2's latest version,
which we were previously unable to due to unittest2 using a newer
version of six.

cc @kyleknap @danielgtaylor