Add librarian-puppet support

Also remove the need to sub-clone and package havana