include 3dAFNItoNIFTI command in interfaces.afni
include AFNItoNIFTI in module init file
now able to set prefix and file extension automatically NIFTI
added hash_file protocol and dummy test file
added changelog information
Merge branch 'enh/afni2nifti'

Conflicts:
	CHANGES
	nipype/interfaces/afni/__init__.py
	nipype/interfaces/afni/preprocess.py
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 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