Fix missing highlighting of trailing whitespace

Ahh, my tab highlighting was overlapping poorly with my trailing
whitespace settings. This consolidates them into one.