tweaked mac settings a little more
Merge branch 'master' of https://github.com/lmoppert/vim-config
Some changes where left after the automated merge