diff --git a/.travis.yml b/.travis.yml
index 433b07266..85ff392b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,19 +10,19 @@ matrix:
   fast_finish: true
 
 env:
-  - FLAGS="-a star" INST=nt NXF_VER=0.27.6
-  - FLAGS="-a star" INST=nt
-  - FLAGS="-a star -s" INST=nts SGT_VER=2.4.5
-  - FLAGS="-a hisat2" INST=nt NXF_VER=0.27.6
-  - FLAGS="-a hisat2" INST=nt
-  - FLAGS="-a hisat2 -s" INST=nts SGT_VER=2.4.5
+  - T=nt  FL="-a star" NXF_VER=0.27.6
+  - T=nt  FL="-a star"
+  - T=nts FL="-a star -s"
+  - T=nt  FL="-a hisat2" NXF_VER=0.27.6
+  - T=nt  FL="-a hisat2"
+  - T=nts FL="-a hisat2 -s"
 
-install: # Install Singularity if needed
-  - "./tests/install.sh $INST"
+install:
+  - "./tests/install.sh $T"
   - "cd ${TRAVIS_BUILD_DIR}/tests/"
 
 script:
   - "nf-core lint ${TRAVIS_BUILD_DIR}"
-  - "travis_wait 30 ./run_test.sh ${FLAGS} -b"
-  - "travis_wait 30 ./run_test.sh ${FLAGS}"
-  - "tree --dirsfirst results/"
+  - "./run_test.sh ${FL} -b"
+  - "./run_test.sh ${FL}"
+  - "find results/" # Print results files
diff --git a/Dockerfile b/Dockerfile
index 854ab3fc7..364e0dcc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,8 @@
-FROM continuumio/miniconda
+FROM nfcore/base
 MAINTAINER Phil Ewels <phil.ewels@scilifelab.se>
 LABEL authors="phil.ewels@scilifelab.se" \
     description="Docker image containing all requirements for the nfcore/RNAseq pipeline"
 
 COPY environment.yml /
-RUN conda update -n base conda && \
-    conda env create -f /environment.yml && \
-    conda clean -a
+RUN conda env create -f /environment.yml && conda clean -a
 ENV PATH /opt/conda/envs/nfcore-rnaseq/bin:$PATH
diff --git a/assets/NGI-RNAseq_logo.png b/assets/NGI-RNAseq_logo.png
deleted file mode 100644
index 8b72a722c..000000000
Binary files a/assets/NGI-RNAseq_logo.png and /dev/null differ
diff --git a/assets/email_template.html b/assets/email_template.html
index e7fc79d27..0d19a497e 100644
--- a/assets/email_template.html
+++ b/assets/email_template.html
@@ -13,7 +13,7 @@
 
 <img src="cid:ngirnaseqlogo">
 
-<h1>nfcore/RNAseq: RNA-Seq Best Practice v${version}</h1>
+<h1>nfcore/RNAseq: version ${version}</h1>
 <h2>Run Name: $runName</h2>
 
 <% if (!success){
diff --git a/assets/email_template.txt b/assets/email_template.txt
index 1ee00e3be..d4c8e2c8a 100644
--- a/assets/email_template.txt
+++ b/assets/email_template.txt
@@ -1,5 +1,5 @@
 ========================================
- nfcore/RNAseq: RNA-Seq Best Practice v${version}
+ nfcore/RNAseq: version ${version}
 ========================================
 Run Name: $runName
 
diff --git a/assets/nfcore-rnaseq_logo.png b/assets/nfcore-rnaseq_logo.png
new file mode 100644
index 000000000..c60e20bfb
Binary files /dev/null and b/assets/nfcore-rnaseq_logo.png differ
diff --git a/conf/aws.config b/conf/aws.config
index 961383aab..83189c346 100644
--- a/conf/aws.config
+++ b/conf/aws.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Nextflow config file for Amazon Web Services
  * -------------------------------------------------
diff --git a/conf/base.config b/conf/base.config
index 009219d34..5e710cfa2 100644
--- a/conf/base.config
+++ b/conf/base.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Nextflow base config file
  * -------------------------------------------------
diff --git a/conf/binac.config b/conf/binac.config
index d4c102a88..c35e58c92 100644
--- a/conf/binac.config
+++ b/conf/binac.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * ----------------------------------------------------------------------------
  *  Nextflow config file for use with Singularity on BINAC cluster in Tuebingen
  * ----------------------------------------------------------------------------
diff --git a/conf/cfc.config b/conf/cfc.config
index e4f04111e..0a4d22514 100644
--- a/conf/cfc.config
+++ b/conf/cfc.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------------------
  *  Nextflow config file for use with Singularity on CFC at QBIC
  * -------------------------------------------------------------
diff --git a/conf/docker.config b/conf/docker.config
index fb427c5e7..439f56682 100644
--- a/conf/docker.config
+++ b/conf/docker.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Nextflow config file for use with Docker
  * -------------------------------------------------
diff --git a/conf/hebbe.config b/conf/hebbe.config
index 8b6d618fc..5b76ed805 100644
--- a/conf/hebbe.config
+++ b/conf/hebbe.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Gothenburg Hebbe Cluster config file
  * -------------------------------------------------
diff --git a/conf/igenomes.config b/conf/igenomes.config
index f532b8dd8..6c9d6d04a 100644
--- a/conf/igenomes.config
+++ b/conf/igenomes.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Nextflow config file for iGenomes paths
  * -------------------------------------------------
diff --git a/conf/singularity.config b/conf/singularity.config
index 15b4bbaf0..745f3c828 100644
--- a/conf/singularity.config
+++ b/conf/singularity.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Nextflow config file for use with Singularity
  * -------------------------------------------------
diff --git a/conf/uppmax-devel.config b/conf/uppmax-devel.config
index 3df73920c..c77db4a0d 100644
--- a/conf/uppmax-devel.config
+++ b/conf/uppmax-devel.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Nextflow config file for UPPMAX (milou / irma)
  * -------------------------------------------------
diff --git a/conf/uppmax-modules.config b/conf/uppmax-modules.config
index 8158dd160..8c988a51c 100644
--- a/conf/uppmax-modules.config
+++ b/conf/uppmax-modules.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Nextflow config file with environment modules for UPPMAX (milou / irma)
  * -------------------------------------------------
diff --git a/conf/uppmax.config b/conf/uppmax.config
index 23d7cc473..9a5e8ff58 100644
--- a/conf/uppmax.config
+++ b/conf/uppmax.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  Nextflow config file for UPPMAX (milou / irma)
  * -------------------------------------------------
diff --git a/docs/output.md b/docs/output.md
index 053e08736..6b9b3fc3d 100644
--- a/docs/output.md
+++ b/docs/output.md
@@ -1,8 +1,8 @@
 # nfcore/RNAseq Output
 
-nfcore/RNAseq is the new RNA-seq Best Practice pipeline used by the [National Genomics Infrastructure](https://ngisweden.scilifelab.se/) at [SciLifeLab](https://www.scilifelab.se/platforms/ngi/) in Stockholm, Sweden.
+nfcore/RNAseq is an RNA-seq analysis pipeline. This document describes the output produced by the pipeline.
 
-This document describes the output produced by the pipeline. Most of the plots are taken from the MultiQC report, which summarises results at the end of the pipeline.
+Most of the plots are taken from the MultiQC report, which summarises results at the end of the pipeline.
 
 ## Pipeline overview
 The pipeline is built using [Nextflow](https://www.nextflow.io/)
@@ -43,7 +43,7 @@ For further reading and documentation see the [FastQC help](http://www.bioinform
   * zip file containing the FastQC report, tab-delimited data file and plot images
 
 ## TrimGalore
-The nfcore/RNAseq BP 2.0 pipeline uses [TrimGalore](http://www.bioinformatics.babraham.ac.uk/projects/trim_galore/) for removal of adapter contamination and trimming of low quality regions. TrimGalore uses [Cutadapt](https://github.com/marcelm/cutadapt) for adapter trimming and runs FastQC after it finishes.
+The nfcore/RNAseq pipeline uses [TrimGalore](http://www.bioinformatics.babraham.ac.uk/projects/trim_galore/) for removal of adapter contamination and trimming of low quality regions. TrimGalore uses [Cutadapt](https://github.com/marcelm/cutadapt) for adapter trimming and runs FastQC after it finishes.
 
 MultiQC reports the percentage of bases removed by TrimGalore in the _General Statistics_ table, along with a line plot showing where reads were trimmed.
 
diff --git a/main.nf b/main.nf
index 9712ecf12..22d0257de 100644
--- a/main.nf
+++ b/main.nf
@@ -1,26 +1,22 @@
 #!/usr/bin/env nextflow
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
-========================================================================================
-               N G I - R N A S E Q    B E S T    P R A C T I C E
-========================================================================================
- New RNA-Seq Best Practice Analysis Pipeline. Started March 2016.
+===============================================================
+ nf-core/RNAseq
+===============================================================
+ RNA-Seq Analysis Pipeline. Started March 2016.
  #### Homepage / Documentation
  https://github.com/nf-core/RNAseq
  #### Authors
  Phil Ewels @ewels <phil.ewels@scilifelab.se>
  Rickard Hammarén @Hammarn  <rickard.hammaren@scilifelab.se>
- Docker and AWS integration by
- Denis Moreno @Galithil <denis.moreno@scilifelab.se>
-----------------------------------------------------------------------------------------
+---------------------------------------------------------------
 */
 
 def helpMessage() {
     log.info"""
-    =========================================
-     nfcore/RNAseq : RNA-Seq Best Practice v${params.version}
-    =========================================
+    ===================================
+     nfcore/RNAseq  ~  version ${params.version}
+    ===================================
     Usage:
 
     The typical command for running the pipeline is as follows:
@@ -199,9 +195,9 @@ Channel
 
 
 // Header log info
-log.info "========================================="
-log.info " nfcore/RNAseq : RNA-Seq Best Practice v${params.version}"
-log.info "========================================="
+log.info "==================================="
+log.info " nfcore/RNAseq  ~  version ${params.version}"
+log.info "==================================="
 def summary = [:]
 summary['Run Name']     = custom_runName ?: workflow.runName
 summary['Reads']        = params.reads
@@ -1101,7 +1097,7 @@ process multiqc {
  */
 process output_documentation {
     tag "$prefix"
-    publishDir "${params.outdir}/Documentation", mode: 'copy'
+    publishDir "${params.outdir}/pipeline_info", mode: 'copy'
 
     input:
     file output_docs
@@ -1193,7 +1189,7 @@ workflow.onComplete {
     email_html = email_html.replaceAll(~/cid:ngilogo/, "data:image/png;base64,$ngilogo")
 
     // Write summary e-mail HTML to a file
-    def output_d = new File( "${params.outdir}/Documentation/" )
+    def output_d = new File( "${params.outdir}/pipeline_info/" )
     if( !output_d.exists() ) {
       output_d.mkdirs()
     }
diff --git a/nextflow.config b/nextflow.config
index 2b8532bad..63e3a525d 100644
--- a/nextflow.config
+++ b/nextflow.config
@@ -1,6 +1,4 @@
 /*
-vim: syntax=groovy
--*- mode: groovy;-*-
  * -------------------------------------------------
  *  nfcore/RNAseq Nextflow config file
  * -------------------------------------------------
@@ -118,7 +116,7 @@ dag {
 
 manifest {
   homePage = 'https://github.com/nf-core/RNAseq'
-  description = 'Nextflow RNA-Seq Best Practice analysis pipeline, part of the nf-core community.'
+  description = 'Nextflow RNA-Seq analysis pipeline, part of the nf-core community.'
   mainScript = 'main.nf'
 }
 
diff --git a/tests/install.sh b/tests/install.sh
index 136b7e992..4e8d61be3 100755
--- a/tests/install.sh
+++ b/tests/install.sh
@@ -6,6 +6,8 @@
 #     s = singularity
 #     t = nf-core/tools
 
+SGT_VER=2.4.5
+
 # Install Nextflow
 if [[ $1 = *n* ]]; then
   cd $HOME