Merge remote-tracking branch 'remotes/origin/master'
Edit .zshrc for peco and .gitconfig