Remove patchbomb from list of contrib files to install since it's now an extension. Innosetup script was referencing old contrib location. Also cosmetic change to group related files.