Merge pull request #1114 from oesteban/enh/carpetplot

[ENH] Carpetplot + confounds plot

Author: oesteban

Dockerfile

@@ -110,7 +110,7 @@ RUN conda install -y mkl=2017.0.1 mkl-service;  sync &&\
     conda install -y numpy=1.12.0 \
                      scipy=0.18.1 \
                      scikit-learn=0.18.1 \
-                     matplotlib=2.0.0 \
+                     matplotlib=2.2.0 \
                      pandas=0.19.2 \
                      libxml2=2.9.4 \
                      libxslt=1.1.29\