Various changes to decouple recipe from Vagrant