merge in changes to magento vhost