Vagrant networking tweaks for Sam

See commit comment d0fcc48

This has the feature flag branch (pull request 47) as a parent, so it would be easiest to merge that one first.