Pulling in merged samtools and mp15 changes