fix:docstring of traits.Directory was not correctly generated
Merge branch 'master' into fix/ElastixDocumentation

Conflicts:
	nipype/interfaces/elastix/base.py
fix:docstrings
Merge pull request #905 from oesteban/fix/ElastixDocumentation

Fix elastix documentation