Update py3kport

Update the py3kport from develop as of a few days ago.  Unit tests pass in py26, py27 and py33.