Update buildout bootstrap and fix a test.
Merge pull request #2 from frgtn/update_buildout_bootstrap

Update buildout bootstrap and fix a test.