Revert "Add a setup.cfg identifying this package as universal"

This reverts commit 61e32319fc9f0390818e518a4890766d1253a165.
Revert "Changelog fixes #290"

This reverts commit 270dacaf33279bed2ae599d718183cec541e032d.
Merge branch '1.11' into 1.12