Vim and zsh fixes