Bugfix for bowtie2 call in bcbio.pipeline.alignment

Resolved merge conflict