Update for more recent puppet and vagrant versions