Use `font-lock-preprocessor-face` for CPP directives

This also changes to use `font-lock-warning-face` for Git's merge
conflicts annotations (see also a469367).

Note: Users will most likely want to customize
      `font-lock-preprocessor-face` now, as the current default looks
      just like `font-lock-function-name-face`.

This hopefully resolves #154.