删除没用的部分
Merge branch 'master' of github.com:dingmingxin/vim_files_ding

Conflicts:
	.vimrc