Add mapping for disabling cursor-keys in insert mode
Merge branch 'master' into linux