Create /var/www/vhosts before /var/www/vhosts/files.stv.tv
Merge branch 'master' of github.com:stvgroup/vagrant-core

Conflicts:
	puppet_manifests/centos58x64_stvcore.pp