Update vim and zsh configs
Merge branch 'master' of github.com:twealm/dotfiles