add marker-gene-string to partial merge
Merge branch 'master' of https://github.com/annaship/py_mbl_sequencing_pipeline

Conflicts:
	pipeline/illumina_files.py