SHORE

This is the same as https://github.com/nipy/dipy/pull/257, except rebased on top of `master`