add variable magit-font-lock-keywords

But don't do any magic to turn highlighting on automatically.
The doc-string contains instructions on how to do so, if desired.
Merge branch 'maint'

Conflicts:
	magit.el
Merge branch 'master' into next

Conflicts:
	magit.el