fix: change where nlmeans check is made
Merge remote-tracking branch 'upstream/master' into fix/dipy

* upstream/master:
  typo in nipype/workflows/dmri/fsl/epi.py
  tiny typo
  Add tests
  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
  fix: topup when out_base is a path
  [algorithms] Overlap interface revision
Merge pull request #939 from satra/fix/dipy

Fix/dipy