Jeff Frontz

@achow101 can you review this?

Note -- I somehow forgot earlier to include the corresponding changes in `make-base-vm` in my previous commit. I just updated/squashed.

Updated to improve compatibility with newer versions of docker.