Initial Python 3 changes (making 2to3 happy)
bytestring/unicode fixes