Added ndindex changes that got mixed up somewhere else
Merge branch 'return_peaks_directions'

Conflicts:
	dipy/reconst/odf.py