Alias vi to vim
Merge branch 'zsh'
Upgrade selecta.vim