Some cleanup, and fix the bash script for Vagrant