Some changelog cleanup
Fixed CHANGELOG and README.md