fixes to broad search and match highlighting
avoiding duplicate hits
clean-up
Merge pull request #38 from jensopetersen/master

fixes to broad search and match highlighting