Massive refactoring, testing, etc.  The deploy.sh script now works
on both VMware and Virtualbox.  Just change your environment variable
for VAGRANT_DEFAULT_PROVIDER to switch around.