Pulled latest bootstrap.py from http://www.buildout.org