Pull in alcy-puppet and merge into own branch