OS X setup
Merge branch 'master' of github.com:bahamas10/dotfiles