fix font-lock-keywords syntax

The syntax is (MATCHER . FACENAME) (note the dot).
remove redundant font-lock-keywords

`lisp-font-lock-keywords' is identical to `lisp-font-lock-keywords1',
`lisp-font-lock-keywords2' is a superset of `lisp-font-lock-keywords1'.
Merge pull request #409 from npostavs/font-lock

Fix yas--font-lock-keywords