osx changes
Merge branch 'master' of github.com:zznq/dotfiles