Fixing test to pass
Fixed doctest example
Merge branch 'enh/ElastixInterface' into experimental

Conflicts:
	nipype/interfaces/elastix/registration.py
Added PointsWarp interface to transformix
Merge branch 'enh/ElastixInterface' into experimental
Fixed doctest example in PointsWarp
Merge branch 'enh/ElastixInterface' into experimental
Fixing filename in doctest
Still correcting test
no comment
Merge branch 'enh/ElastixInterface' into experimental
Added elastix to interfaces/setup.py
Merge branch 'enh/ElastixInterface' into experimental