Improve highlighting

From: https://github.com/kien/ctrlp.vim/pull/488

> Two options here for highlighting, see the two different commits. The second is better than the first, but more complicated.