Move the python3 branch to master now it works on Python 2 as well.

This new, single codebase supports Python 2.6 and above (hopefully,
I've only tested 2.7!) as well as all Python 3 releases. It provides
a moderate performance improvement over the old Python 2 code due to
getting rid of implicit str/unicode conversions.