modified:   .vimrc
Merge branch 'master' of github.com:nbari/my-vim