Merge pull request #630 from timbray/master

Handle changed keybase.io search results format
Support mutliple search words and highlight them

For the regex matching it would be smart to sort the words by length,
so the longest matches come first. This only matters for queries with
words containing parts of each other, which is an unlikely event and
even then it doesn't break anything.
Add highlighting to keyserver/keybase search
Use Highlighter instead of HighlightQueryCursorAdapter
Rename mCurQuery to mQuery for consistency
Rename KeyServer to Keyserver
Merge highlight keyserver pull request
Merge branch 'thi-highlight-keyserver-search-results-as-well'
Add license header to FixedDrawerLayout
Layout fixes for key import
Add Log.d for QueryFailedException
Add Log.d for QueryFailedException