my stuff
Merge branch 'master' of github.com:tduffield/docker-demo

Conflicts:
	metadata.rb
	recipes/mongo_host.rb