Merge branch 'master' into dev
add the <a-j> and <a-k> keymap for move one line down and up.
Merge branch 'dev'