Set vi mode and smarter hist search
Set vi mode and smarter hist search
Merge branch 'master' into edge