Merge branch 'calnh' of woldlab.caltech.edu:samtools into calnh