Intermediate check-in. Reformatted params for Chef bootstrap