Merge pull request #103 from biowdl/small_fixes

small fixes

fastqc.wdl

@@ -83,7 +83,7 @@ task GetConfiguration {
     }
 
     runtime {
-        memory: 1
+        memory: 2 # Needs more than 1 to pull the docker image
         docker: "quay.io/biocontainers/fastqc:" + dockerTag
     }
 }

samtools.wdl

@@ -57,12 +57,13 @@ task Merge {
     input {
         Array[File]+ bamFiles
         String outputBamPath
+        Boolean force = true
 
         String dockerTag = "1.8--h46bd0b3_5"
     }
 
     command {
-        samtools merge ~{outputBamPath} ~{sep=' ' bamFiles}
+        samtools merge ~{true="-f" false="" force} ~{outputBamPath} ~{sep=' ' bamFiles}
     }
 
     output {