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