Fetch upstream and Merge branch 'master' into enh/AddCSVRow
Added file-locking to interface

Now, the interface is thread-safe using lockfile. It is included in
documentation, and also a warning is issued when the module is not
available or could not be imported.
Merge branch 'enh/AddCSVRow' into experimental

Conflicts:
	nipype/algorithms/misc.py