Merge branch 'master' of github.com:lxneng/oh-my-zsh
update zshrc