Better git conflict style
Better split pane navigation in vim
No more vi mode in zsh, it's annoying