Update .vimrc .zshrc
Various improvements
Improve remove_git_branch and remove_merged_branches