master
docs fixup
doc: remove `module` suffix from descriptions
Add a few more nice to have hooks
Remove merge-conflict wart