merging multimapper changes and fix to paired bam alignment