Merge branch 'master' into lif_fmri

* master: (257 commits)
  fix: version property
  doc: added pointer to ants example
  fix: removed cma to freesurfer mapping, updated docs and pointed to atlas/template downloads
  fix: remove np deprecation decorator and moved imports to run_interface.
  fix: explicitly test for nipy version and remove imports to specific interfaces closes #648
  Added FuzzyOverlap to changelog
  fix: set slice_times as seconds outside workflow generating function
  fix: replaced plugin_args with proper arguments
  enh: replace realignment routine with newer Nipype interface for Nipy's newer class
  enh: added SpaceTimeRealign from nipy 0.4.dev
  api: always run datasink and let copyfiles decide if things need to be copied or not. in case inputs are directories, this will allow refreshing outputs.
  fix: moved imports for dicominfo outside of the function
  fix: use ceiling of slice thickness for erosion purposes
  fix: add imports to the functions
  enh: compressing more into functions
  enh: replaced erosion with slicethickness and added epimask support for bbregister
  fix: updated ants example to use new parameters from ants
  tst: fixed ants doctests to indicate smoothing sigmas
  enh: updated antsApplyTransforms to accept input image type
  api: changed smoothing sigmas to accept float in antsRegistration
  ...
Merge branch 'master' into nitime

* master: (146 commits)
  fix: version property
  doc: added pointer to ants example
  fix: removed cma to freesurfer mapping, updated docs and pointed to atlas/template downloads
  fix: remove np deprecation decorator and moved imports to run_interface.
  fix: explicitly test for nipy version and remove imports to specific interfaces closes #648
  Added FuzzyOverlap to changelog
  fix: set slice_times as seconds outside workflow generating function
  fix: replaced plugin_args with proper arguments
  enh: replace realignment routine with newer Nipype interface for Nipy's newer class
  enh: added SpaceTimeRealign from nipy 0.4.dev
  api: always run datasink and let copyfiles decide if things need to be copied or not. in case inputs are directories, this will allow refreshing outputs.
  fix: moved imports for dicominfo outside of the function
  fix: use ceiling of slice thickness for erosion purposes
  fix: add imports to the functions
  enh: compressing more into functions
  enh: replaced erosion with slicethickness and added epimask support for bbregister
  fix: updated ants example to use new parameters from ants
  tst: fixed ants doctests to indicate smoothing sigmas
  enh: updated antsApplyTransforms to accept input image type
  api: changed smoothing sigmas to accept float in antsRegistration
  ...
Merge branch 'master' into spm/gzip

* master: (193 commits)
  fix: version property
  doc: added pointer to ants example
  fix: removed cma to freesurfer mapping, updated docs and pointed to atlas/template downloads
  fix: remove np deprecation decorator and moved imports to run_interface.
  fix: explicitly test for nipy version and remove imports to specific interfaces closes #648
  Added FuzzyOverlap to changelog
  fix: set slice_times as seconds outside workflow generating function
  fix: replaced plugin_args with proper arguments
  enh: replace realignment routine with newer Nipype interface for Nipy's newer class
  enh: added SpaceTimeRealign from nipy 0.4.dev
  api: always run datasink and let copyfiles decide if things need to be copied or not. in case inputs are directories, this will allow refreshing outputs.
  fix: moved imports for dicominfo outside of the function
  fix: use ceiling of slice thickness for erosion purposes
  fix: add imports to the functions
  enh: compressing more into functions
  enh: replaced erosion with slicethickness and added epimask support for bbregister
  fix: updated ants example to use new parameters from ants
  tst: fixed ants doctests to indicate smoothing sigmas
  enh: updated antsApplyTransforms to accept input image type
  api: changed smoothing sigmas to accept float in antsRegistration
  ...
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' into enh/freesurfer

* master:
  add DicomImport to spm init.py
  fix merge conflict in CHANGES
  add interface for spm's dicom import
  spm wants a two-item array here
  Fence matplotlib import with try block
  Get backend configurable from node config
  Set matplotlib backend from config in pyscript
  Attempt to set backend in local matplotlib
  fix: matplotlib import to inside function
  added changelog information
  enh: update internal prov to latest version of external library
  added hash_file protocol and dummy test file
  Remove inheritance_diagram.py.
  now able to set prefix and file extension automatically NIFTI
  include AFNItoNIFTI in module init file
  include 3dAFNItoNIFTI command in interfaces.afni
Merge branch 'master' into lif_fmri

* master: (29 commits)
  add DicomImport to spm init.py
  fix merge conflict in CHANGES
  add interface for spm's dicom import
  spm wants a two-item array here
  Fence matplotlib import with try block
  Get backend configurable from node config
  Set matplotlib backend from config in pyscript
  Attempt to set backend in local matplotlib
  fix: matplotlib import to inside function
  added changelog information
  enh: update internal prov to latest version of external library
  added hash_file protocol and dummy test file
  Remove inheritance_diagram.py.
  fix: afni url in afni package
  added more documentation
  Added dummy files
  fixed inputs for Retroicor
  adding retrocicor to __init__.py
  addition of 3dretroicor interface, very basic version
  enh: allow naming a workflow
  ...
Merge branch 'master' into name_source_refactor

* master:
  add DicomImport to spm init.py
  fix merge conflict in CHANGES
  add interface for spm's dicom import
  spm wants a two-item array here
  Fence matplotlib import with try block
  Get backend configurable from node config
  Set matplotlib backend from config in pyscript
  Attempt to set backend in local matplotlib
  fix: matplotlib import to inside function
  added changelog information
  added hash_file protocol and dummy test file
  now able to set prefix and file extension automatically NIFTI
  include AFNItoNIFTI in module init file
  include 3dAFNItoNIFTI command in interfaces.afni
Merge branch 'master' into nitime

* master: (29 commits)
  add DicomImport to spm init.py
  fix merge conflict in CHANGES
  add interface for spm's dicom import
  spm wants a two-item array here
  Fence matplotlib import with try block
  Get backend configurable from node config
  Set matplotlib backend from config in pyscript
  Attempt to set backend in local matplotlib
  fix: matplotlib import to inside function
  added changelog information
  enh: update internal prov to latest version of external library
  added hash_file protocol and dummy test file
  Remove inheritance_diagram.py.
  fix: afni url in afni package
  added more documentation
  Added dummy files
  fixed inputs for Retroicor
  adding retrocicor to __init__.py
  addition of 3dretroicor interface, very basic version
  enh: allow naming a workflow
  ...
Merge branch 'master' into spm/gzip

* master: (29 commits)
  add DicomImport to spm init.py
  fix merge conflict in CHANGES
  add interface for spm's dicom import
  spm wants a two-item array here
  Fence matplotlib import with try block
  Get backend configurable from node config
  Set matplotlib backend from config in pyscript
  Attempt to set backend in local matplotlib
  fix: matplotlib import to inside function
  added changelog information
  enh: update internal prov to latest version of external library
  added hash_file protocol and dummy test file
  Remove inheritance_diagram.py.
  fix: afni url in afni package
  added more documentation
  Added dummy files
  fixed inputs for Retroicor
  adding retrocicor to __init__.py
  addition of 3dretroicor interface, very basic version
  enh: allow naming a workflow
  ...