Converting vagranfile to version 2
Merge branch 'master' of github.com:christophervalles/ZF2-Vagrant

Conflicts:
	Vagrantfile