Move zsh keybinds together in the zshrc and be more careful about command order
Also map ctrl-p and ctrl-n to zsh history search