vim: highlight -> hlsearch (whoops)
Merge remote-tracking branch 'origin/master' into mac