Update to a more recent version of `six.py`.

From here: https://bitbucket.org/gutworth/six/overview
Merge pull request #213 from arokem/fix_six

RF - Update to a more recent version of `six.py`.