update: vimrc
Merge branch 'master' of github.com:jyd519/vimconf

Conflicts:
	_vimrc