Ensure that comment always takes precedent before feature when selecting tone
Add feature test for new tonal rules
Merge pull request #2695 from guardian/correct-tonal-logic

Correct tonal logic