为 Mac 调整设置
Merge branch 'master' of https://github.com/holysoros/dotvim

Conflicts:
	vimrc