Add more keybindings, and fix a couple to not conflict w/ paredit