touched up to use new version of puppet-librarian