Fix a coupla comments

- Add `hubot` prefix to command docs in scripts which lacked it
- Remove conflict between `beerme` and `beeradvocate`.

Replaces #1293 which was a :shit:show. :smiley: