Remove Apache default vhost
Merge branch 'vagrant'