Fix Vagrant and Missing Commits

This fixes Vagrant usage with mysql and adds back a few missing commits.