Remove opt_to_dict
Merge remote branch 'origin/master'
Update generic target generator to take care of Illumina-like and generic fastq file names