字体大小
Merge branch 'master' of http://github.com/Wangzongcan/vimfiles

Conflicts:
	vimrc