bad commit msg
Merge branch 'master' of github.com:lundjordan/dotfiles
setup for mac os x