Change pane changing shortcut
Added autocomplete popup to vimrc
Resolve conflicts