Highlighting percolator (0.20)

Resending PR #2387, this time against branch 0.20, merged with recent changes to the highlighter there. Full description here: https://github.com/elasticsearch/elasticsearch/pull/2387

I see 4 failing tests, but they also fail for the original 0.20 branch. Just sayin'.

Hopefully this is going to be merged soon...