Changelog update, added notes for previous merges.

I'll just put up with the merge conflicts for now.