Compatibility module for the python 2 and 3 versions.
Use compat's TestCase
Use unittest2 if available and gracefully falls back to unittest.
Vendor version of six.
I give up, pep8/lint six. dealwithit.jpg
Merge remote-tracking branch 'origin/master' into p3k

Conflicts:
	tests/client/tests.py
	tests/contrib/flask/tests.py
	tests/transport/tests.py