fix: matplotlib import to inside function
Merge pull request #668 from satra/fix/mpl_in_nipy

fix: matplotlib import to inside function
Attempt to set backend in local matplotlib
Set matplotlib backend from config in pyscript
Get backend configurable from node config
Fence matplotlib import with try block
Merge pull request #671 from mwaskom/fix/matplotlib_backend

Set Matplotlib backend robustly during distributed execution
spm wants a two-item array here
add interface for spm's dicom import
fix merge conflict in CHANGES

Conflicts:
	CHANGES
add DicomImport to spm init.py
Merge pull request #672 from beOn/spm_dicom

Spm dicom
Merge branch 'master' of github.com:oesteban/nipype
Revert "Merge branch 'enh/CaminoConMat'"

This reverts commit 1af3d98cb855385a2be6e2c3c5cf32be6f1945b7, reversing
changes made to e17ab6ac0977d0c3cd223a40bc22e856283fd6c7.
Revert "Merge branch 'enh/NewPreprocessDMRIWorkflows'"

This reverts commit e17ab6ac0977d0c3cd223a40bc22e856283fd6c7, reversing
changes made to 61e35231309a092d8896d750dd30e74857dffe14.
Added AddNoise interface

New miscelaneous interface that simply adds noise to a certain
SNR (in dB).
Merge branch 'enh/NewMiscTools' into unstable

Conflicts:
	CHANGES
	nipype/algorithms/misc.py
	nipype/interfaces/fsl/__init__.py
	nipype/interfaces/fsl/epi.py
	nipype/workflows/dmri/fsl/epi.py