better rebase master
Added zshell config