Revise keymapping for Unite.vim
Merge branch 'master' into mac