vim: Allow 'kj' to exit insert mode
Merge remote-tracking branch 'origin/master' into mac