modified .vimrc and .zshrc
Merge branch 'master' of github.com:twhs/dotfiles