some fixes
Merge branch 'master' into add-docker-bootstrap
some more fixes
Merge pull request #151 from cloudify-cosmo/add-docker-bootstrap

Add docker bootstrap