Updated osx settings

Based on https://github.com/mathiasbynens/dotfiles/blob/master/.osx