First stab at updating the CHANGELOG for 2.0

Probably more to do here..
CHANGELOG tweaks suggested in pr
Add some more stuff to the changelog
Merge branch 'master' into update-changeloge-for-2.0
Update CHANGELOG for 2.0
Merge branch 'update-changeloge-for-2.0'