stuff
Merge branch 'local_variance' of github.com:samuelstjean/dipy into local_variance