Fix up #3285 (very minor changes)

This may look like a lot but that's just because it merges up master.

The only actual changes are adding the parens to the somewhat confusing `unless` statement early on, and adding `plugins/` to doc'ed areas for msf (seems useful anyway).

If you merge this PR to your branch, your PR back to rapid7#3285 will update automatically.