updated crooked headlines
Merge branch 'master' into add-docker-bootstrap
some more stuff
Merge pull request #171 from cloudify-cosmo/add-docker-bootstrap

Add docker bootstrap