vimrc plugin adjustments
Merge branch 'master' of https://github.com/azngeoffdog/dotfiles-zsh
Merging commits