Fixing mac font size.
Merge branch 'master' of github.com:jmervine/vim-config

Conflicts:
	.vimrc.bundles.local