modify .zshrc and add .gitconfig
modify .vimrc
merge