fsl/utils.py: fix error from InvWarp generated filename
Additionnal correction to FSL invwarp. Missing option from Camino dtifit
Merge branch 'pr/686'

Conflicts:
	nipype/interfaces/fsl/utils.py
Removed left over class