Fix connection sharing between local and Vagrant env

This is merge-able :) I'll mark WIP PRs as `WIP` in the future!