change mac font settings
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/guotsuan/gqvim

Conflicts:
	vimrc
update to has(mac) auto-detection