Cleanup comment annotation highlighting a bit
Rename prelude-add-comment-annotations to prelude-font-lock-comment-annotations
Pull in upstream changes