update from mac
Merge branch 'master' of github.com:ninegene/dotfiles