wip
conflict resolved in odf.py
Merge branch 'master' of github.com:nipy/dipy
Merge branch 'master' of github.com:nipy/dipy
Merge branch 'master' of github.com:nipy/dipy
synced with master