Bump version number, fix up CHANGES.