update
Merge branch 'feature/ubuntu-linux' of https://github.com/xuwupeng2000/.vim into feature/ubuntu-linux

Conflicts:
	vimrc
update