More codonaligner fixes for dealing with merging pairwise alignments into an MSA