Moved to zsh, again.  Maybe this time it will stick.  Too many things
bothered me about vi-mode in bash