Vagrantfile setup

Conflicts:
	Vagrantfile