Cleaned-up and merged template, fixed error in Picard's MergeSam.