Clean up vagrant setup and have the droplet use same install/upgrade scripts