Remove changes to CHANGELOG and gemspec to allow easy merge