Add support for highlight query

Closes #854
Add enum overload to set the highlighter type
Add matched_fields to field highlighting options
Merge pull request #1076 from elasticsearch/feature/highlight-query

Feature/highlight query