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

Conflicts:
	.vimrc.bundles.local
Excluding jade files from auto-whitespace stripping.
Merge branch 'master' of github.com:jmervine/vim-config
Adding strip whitespace function.
Merge branch 'master' into centos
Merging