Some more refactoring of the Vagrantfile and cloud.json to work with the 3.x architecture.