fix zsh plugins in setup, and some vimrc bits
a merge derp derp
merge broz