Fix setup.cfg on Python 2.6
Merge branch 'master' of github.com:dstufft/twine
bump version