move bam12auxmerge into bwa_post_proc, and other minor changes