Add mapping for Unite-menu
Merge branch 'master' into linux