Merge develop into master (#25)

* Flatten build to a single Dockerfile to work around DockerHub space problem.

* latest exec summ

* Latest Exec Summ (with fix for DCAN_and_FD...).

Dockerfile

@@ -209,10 +209,9 @@ WORKDIR /opt/dcan-tools
 # dcan bold processing
 ADD https://github.com/DCAN-Labs/dcan_bold_processing.git version.json
 RUN git clone -b v4.0.6 --single-branch --depth 1 https://github.com/DCAN-Labs/dcan_bold_processing.git dcan_bold_proc
-#RUN git clone -b develop --single-branch --depth 1 https://github.com/DCAN-Labs/dcan_bold_processing.git dcan_bold_proc
 
 # dcan executive summary
-RUN git clone -b v2.2.9 --single-branch --depth 1 https://github.com/DCAN-Labs/ExecutiveSummary.git executivesummary
+RUN git clone -b v2.2.10 --single-branch --depth 1 https://github.com/DCAN-Labs/ExecutiveSummary.git executivesummary
 RUN gunzip /opt/dcan-tools/executivesummary/templates/parasagittal_Tx_169_template.scene.gz
 
 # dcan custom clean