Fixup commit message, PR title, etc
Fixup commit message, PR title, etc

The watch_keyword handling was simply reusing the blacklist messages.
Refactored for clarity to indicate what was done and fix e.g. the generated
Metasmoke query for the PR for new watches.

Charcoal-SE/SmokeDetector,Charcoal-SE/SmokeDetector