* rules/bio/ngs/methylseq/bismark.rules: correct bismark_align so read1, read2 file used as input and not read1, read1
* rules/bio/ngs/settings.rules: add read1, read2 suffix specification for pathological renaming cases
* rules/bio/ngs/methylseq/bismark.rules: Update rules
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/methylseq

Conflicts:
	rules/bio/ngs/methylseq/bismark.rules
Finish merge