Fixed for Mac OS X settings.
Merge branch 'master' of https://github.com/benkamphaus/dotfiles