Updated to latest v2 bootstrap

Downloaded from http://downloads.buildout.org/2/bootstrap.py
Set up tox, make tests pass on 2.6 and 2.7