Make Mac OS X config conditional
Merge branch 'master' of github.com:scooter-dangle/dotfiles