Set vi mode.. or.. for some reason i key doesn't work?
Merge branch 'master' into thinx