udpate
Merge branch 'master' of github.com:yuanotes/dotvim

Conflicts:
	init.vim