Hopefully this will the last move for 2 years.

This move gives us a version of git which uses absolute paths
in the .git files in submodules, so sharing a repo with the
host should be cleaner.

The current Vagrant box does not appear to use a vagrant user.  This
might change in future boxes.