Update .vimrc
support go, c, shell
conflict
Merge remote-tracking branch 'upstream/master'