New bootstrap to work with buildout 2.2.0
Modified .gitignore to add extensions/test
Merge branch 'master' into prs