Some OSX tweaks.
Merge branch 'master' of git://github.com/philippbosch/dotfiles
Merge branch 'master' of https://github.com/philippbosch/dotfiles