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