fix: topup when out_base is a path
Fixes #933
moved the import inside the constructor
fix: change where nlmeans check is made
new naming conventions
Merge remote-tracking branch 'upstream/master' into fix/topup

* upstream/master: (82 commits)
  tiny typo
  another attempt at fixing bash conditionals
  fixed bash conditionals
  added no dep install version. we'll be testing on both.
  Added xor option in Camino connectivity for robustness
  Conmat test function
  Added more connectivity matrix options in Camino interface
  Fixed tests.
  remove deb packages installation
  added apt caching
  fix: d3 change.
  switched to six.string_types for string type checks
  added external package: 'six'
  Mention AddNoise in the changelog
  Remove d3.min.js dependency
  Log cleanup
  Fixed tests
  Update README.rst
  Update links_names.txt
  Update index.rst
  ...
Merge branch 'master' into enh/UpdateBEDPOSTX

Conflicts:
	CHANGES
	nipype/algorithms/misc.py
	nipype/interfaces/freesurfer/utils.py
bedpostx_parallel avoid computation of dyads uncertainty available
Interface Merge for large files
Merge branch 'enh/UpdateBEDPOSTX' of github.com:oesteban/nipype into enh/UpdateBEDPOSTX
fix missing comma
added computation of mean f samples in bedpostx
fix missing connections
typo in nipype/workflows/dmri/fsl/epi.py
fixed several bugs. tested in practice
Merge pull request #937 from cni-md/master

typo in nipype/workflows/dmri/fsl/epi.py
Merge remote-tracking branch 'upstream/master' into fix/bedpostx

* upstream/master:
  typo in nipype/workflows/dmri/fsl/epi.py
  Add tests
  [algorithms] Overlap interface revision
Merge remote-tracking branch 'private/fix/dipy_tests'

* private/fix/dipy_tests:
  moved the import inside the constructor
  Fixes #933
Merge remote-tracking branch 'upstream/master' into fix/bedpostx

* upstream/master:
  moved the import inside the constructor
  Fixes #933
Merge pull request #928 from satra/fix/topup

fix: topup when out_base is a path