Remap j, k, 0, $ as expected
Merge branch 'master' into mac