Cleanup OSX setup.
Merge branch 'master' of https://github.com/iauns/dotfiles