Use 'Librarian-Chef' rather than 'Berkshelf'
Merge remote-tracking branch 'upstream/master'