Revise mapping for nohlsearch silent
Merge branch 'master' into mac