Pulling in the latest changes to vagrant-ganeti

Pulling in the latest changes to vagrant-ganeti from ramereth.