v2
Merge branch 'master' of https://github.com/umarferrer/vagrant

Conflicts:
	Vagrantfile
	scripts/extra.sh
	scripts/vhost.sh