Various changes to decouple chef-local and vagrant from recipe.