clean up changelog and tag confusion in my checked out tree