Add keymap for UniteResume
Merge branch 'master' into linux