remove unnecessary mapping, remove branch name from vim, update zsh