Add face as well as font-lock-face

So that colours show in all kinds of buffer.
Refactored to use with-current-location.
Added a test to bug with orgel->org mode.