update
Merge branch 'master' of https://github.com/m3rten/dockerhost

Conflicts:
	Vagrantfile