Allow multiple runs of basic test. Move package installs of git vim curl...

... and cobbler into the initial puppet run, and do this before the cobbler pre-import