Rebase from upstream project
Rebase from upstream project for old zsh
Add push configuration to gitconfig