Merge remote-tracking branch 'origin/ref/modularize-multifile-renamers' into ref/modularize-multifile-renamers

# Conflicts:
#	CHANGELOG.md
#	docs/conf.py
#	docs/installation.rst
#	docs/usage.rst
#	heudiconv/convert.py
#	heudiconv/info.py

Author: tsalo

CHANGELOG.md

@@ -353,10 +353,14 @@ TODO Summary
 [#404]: https://github.com/nipy/heudiconv/issues/404
 [#407]: https://github.com/nipy/heudiconv/issues/407
 [#419]: https://github.com/nipy/heudiconv/issues/419
+<<<<<<< HEAD
 [#420]: https://github.com/nipy/heudiconv/issues/420
 [#425]: https://github.com/nipy/heudiconv/issues/425
 [#430]: https://github.com/nipy/heudiconv/issues/430
 [#432]: https://github.com/nipy/heudiconv/issues/432
 [#434]: https://github.com/nipy/heudiconv/issues/434
 [#436]: https://github.com/nipy/heudiconv/issues/436
 [#437]: https://github.com/nipy/heudiconv/issues/437
+=======
+[#425]: https://github.com/nipy/heudiconv/issues/425
+>>>>>>> origin/ref/modularize-multifile-renamers

docs/installation.rst

@@ -7,32 +7,32 @@ Installation
 
 Local
 =====
-Released versions of HeuDiConv are available on `PyPI <https://pypi.org/project/heudiconv/>`_ 
-and `conda <https://github.com/conda-forge/heudiconv-feedstock#installing-heudiconv>`_. 
+Released versions of HeuDiConv are available on `PyPI <https://pypi.org/project/heudiconv/>`_
+and `conda <https://github.com/conda-forge/heudiconv-feedstock#installing-heudiconv>`_.
 If installing through ``PyPI``, eg::
 
     pip install heudiconv[all]
 
-Manual installation of `dcm2niix <https://github.com/rordenlab/dcm2niix#install>`_ 
+Manual installation of `dcm2niix <https://github.com/rordenlab/dcm2niix#install>`_
 is required.
 
-On Debian-based systems we recommend using `NeuroDebian <http://neuro.debian.net>`_ 
+On Debian-based systems we recommend using `NeuroDebian <http://neuro.debian.net>`_
 which provides the `heudiconv package <http://neuro.debian.net/pkgs/heudiconv.html>`_.
 
 
 Docker
 ======
-If `Docker <https://docs.docker.com/install/>`_ is available on your system, you 
-can visit `our page on Docker Hub <https://hub.docker.com/r/nipy/heudiconv/tags>`_ 
+If `Docker <https://docs.docker.com/install/>`_ is available on your system, you
+can visit `our page on Docker Hub <https://hub.docker.com/r/nipy/heudiconv/tags>`_
 to view available releases. To pull the latest release, run::
 
     $ docker pull nipy/heudiconv:0.8.0
 
 
 Singularity
 ===========
-If `Singularity <https://www.sylabs.io/singularity/>`_ is available on your system, 
-you can use it to pull and convert our Docker images! For example, to pull and 
+If `Singularity <https://www.sylabs.io/singularity/>`_ is available on your system,
+you can use it to pull and convert our Docker images! For example, to pull and
 build the latest release, you can run::
 
     $ singularity pull docker://nipy/heudiconv:0.8.0