Run modernize.
Fix StringIO issues in tests.
Fix issue with unicode.
Fix basestring usage.
Test with flake8 and check-manifest.
Remove unused imports.
Drop 2to3.
Fix pep8.
Merge pull request #57 from mcmtroffaes/feature/py-universal

Use six instead of 2to3.