Added Cufflinks output to the upload directory.
Added samtools sam->bam conversion and merging.

Part of phasing out of using Picard. sambamba is still flaky in a bunch of
areas so support for it is implemented, but turned off.
Revert the switch to samtools merge.

It doesn't work the same as Picard merge as it is.