Changelog entries for the latest merges
DOC: Slight tune ups to ChangeLog -- we must release!