better apache2/vhost setup
Merge branch 'master' of https://github.com/farinspace/linux-setups