Update vim and zsh confs
Merge branch 'vimplug'