Changed ToJSON instance for multimatch query
Skeleton types for highlights
Added ToJSON instances for Highlight types. Added the beginings of tests.
Added map to deal with highlight response
Added order parameter to CommonHighlight
Merged with master
Fixed merge.. oops
Merge pull request #19 from latkins/master

Add Highlight support.