Adds support for search suggestions and highlights.

DO NOT MERGE, only review.  I'll need to sed -i.bak 's/shutej/mattbaird/' before we merge.