Correct footer
Limit keywords to finder keywords

These shouldn't be arbitrary words.

(info "(elisp)Library Headers")
Fix some issues reported by checkdoc
Remove duplicate macro

This was unintentionally introduced in ece07d7c50cd.
Merge branch 'master' into next

Conflicts:
	magit-annex.el
Fix some more issues reported by checkdoc