Adding vi mode
Merge branch 'master' into baby
Copy and paster with vim and tmux
merge master