working on osx dotfiles!
Merge branch 'master' of https://github.com/bevacqua/dotfiles
osx hackery