Update CHANGES.rst

Removed stuff from the changelog that wasn't meant to be there; moved stuff that was in the wrong release.