whitespace reorg of control file for easier to read diffs; notes about upcoming version into the changelog file
Changed paths: