update vagrantfile
Merge branch 'master' of github.com:mycozycloud/cozy-setup

Conflicts:
	dev/Vagrantfile