More work transitioning to Vagrant-based web server