add buildout config/bootstrap
merge buildout changes from branch-1.0