Updated changelog for recent merges, and reorganized it a little