Rename clear-buffer -> clear-scrollback, move magit hooks back into conf