two parameters to bootstrap
Merge branch 'master' of https://github.com/stefberg/cloud-automation