Update zshrc
Update gitconfig
Merge branch 'master' of github.com:yamayo/dotfiles