update zshrc and add zshrc osx
term colors
Merge remote-tracking branch 'origin/master'