Rename gem bosh-manifests => bosh-workspace
Merge branch 'master' of https://github.com/rkoster/bosh-manifests

Conflicts:
	bosh-workspace.gemspec