vhost basename fixes
Merge pull request #127 from makinacorpus/stable

vhost basename fixes