shiftwidth
排除_vimrc~
Merge branch 'master' of https://github.com/shooker2012/vim_ms

Conflicts:
	_vimrc~