merged py3k to master

that was fun!