Update to latest bootstrap

Downloaded from http://downloads.buildout.org/2/bootstrap.py
Fix some (but not all) Python 3 incompatibilities