Refactors sites helpers to use unified vhost handler. Fixes #12