Update apache2.conf
Merge branch 'apache-mariadb-php55' of bitbucket.org:lukaszjakubek/vagrant-webdev into apache-mariadb-php55
Fix web directory