update vimrc
vimrc
Merge branch 'master' of https://github.com/xqin/dotvim

Conflicts:
	vimrc