add support for librarian-puppet plus a few other options