vim: Instead of unsetting hlsearch, let @/ be empty
Merge remote-tracking branch 'origin/master' into mac