Added vi mode (binding similar to emacs mode)
Merge branch 'origin/vi-mode'