Added some fixes for vhosts
Merge branch 'master' of github.com:nbroslawsky/nathanbroslawsky