fix zsh vimmode display, fix neobundle branch