Fix a bug introduced in #33

In doing the refactoring and changes for #33 it made it so the hl-line face was overriding the foreground color of things.

on a side note, can I just keep sending small incremental merge requests? I foresee some changes are going to need to be made to some of these new faces.