Add combined vm config to vagrant and salt.
Change git to pull the master of the buildout repo and the visualiser repo (rather than using the add_combined_salt_buildout_support branch)