Basic highlighting.

Added highlighting; rehighlights on important actions and general editing.
Forgot to pull beforehand, ruined my local tree. Merged in Brendan's work from
this afternoon (and aforementioned highlighting). Let me know if I broke it.
Works on my Fedora box.