Introduce puppet librarian

Plus minor fixes