Merged in nsoranzo/galaxy-central (pull request #262)

Convert other 3 tools to $GALAXY_SLOTS

tools/ngs_rna/trinity_all.xml

@@ -36,7 +36,7 @@
         --JM 10G
 
         ## CPU and butterfly options.
-        --CPU 6 --bfly_opts "-V 10 --stderr" > $trinity_log 2>&1
+        --CPU \${GALAXY_SLOTS:-6} --bfly_opts "-V 10 --stderr" > $trinity_log 2>&1
     </command>
     <inputs>
         <conditional name="inputs">

tools/sr_mapping/bowtie2_wrapper.xml

@@ -21,7 +21,7 @@
         bowtie2
         
         ## number of threads
-        -p 4
+        -p \${GALAXY_SLOTS:-4}
 
         ## index file path
         -x $index_path

tools/sr_mapping/mosaik.xml

@@ -3,7 +3,7 @@
   <description/>
   <requirements><requirement type="package">mosaik</requirement></requirements>
   <command>
-    #set $processors = '-p 4'
+    #set $processors = '-p ${GALAXY_SLOTS:-4}'
     #set $lm = ''
     #if $paired.kind == 'single':
         #set $mfl = ''