building docker vagrant file
Merge branch 'master' of https://github.com/benjaminleighton/registry-deploy-poc

Conflicts:
	Vagrantfile