Update CHANGELOG to relflect latest changes on master