Change sort of registered readers/writers to avoid comparing types

Closes #2312
Fix formatting issues in CHANGES.rst
Merge pull request #2322 from mwcraig/fix-2312

Change sort of registered readers/writers to avoid comparing types