Update bootstrap.py
Update to zc.buildout version 2
Add prefer-final=false to preserve pre-version-2 buildout behavior
progress with bower
merge from master