Updated .vimrc
Merge branch 'master' of github.com:Shougo/shougo-s-github
- Updated .zshrc.