oops typo fix
vi mode in zsh and readline
vcs prompt adjust
Merge branch 'master' into ccap