Update bootstrap.py and tweak the tests so that they work under Python 2.6 and 2.7 on travis (hopefully) as well as from 'setup.py test'