Merge pull request #1957 from davidmorgan/single-quotes-message

Improve prefer_single_quotes message.