Minor changes to vim config and fixing zshrc.
Merge branch 'master' of github.com:cjfrisz/dotfiles