Merge pull request #1510 from codespell-project/peternewman-sort-matcher

Add our sort matcher too