Make vagrant config compatible with newest vagrant version
Merge branch 'master' of github.com:gattazr/Vagrant-LAMP

Conflicts:
	site-cookbooks/vagrant-lamp/templates/default/xdebug.ini.erb