update vim config
Merge branch 'master' of github.com:shenfeng/dotfiles

Conflicts:
	vimrc