More vi keys
Merge pull request #2 from vain/patch-3

More vi keys