initial highlight implementation - no --and support
highlight for "--and", and tests
Merge branch 'highlight'

Conflicts:
	runtest.sh