some changes from mac:
Merge branch 'master' of github.com:dpzmick/dotfiles