Reformat to use current puppet formatting standard, and remove lint warnings/errors