Change highlighting so that individual lines of logs can be highlighted

[fyellin]

Fix highlighting Use from future import annotations to simplify some annotations Make class names shorter.