modified:   rc/vimrc
Merge branch 'master' of github.com:bgnori/.vim