Move the python3 branch to master, giving a single unified codebase.

This works on Python 2 (2.6 and above) and 3 (all releases). It also
provides a minor performance improvement on Python 2 compared with
the old master, due to lack of implicit str/unicode conversions.