Merged Illumina and Affymetrix

Also big updates to the logic and comments and extended debug/config
options.