Adding some vagrant and puppet support