NF: peaks_from_models now can also output spherical harmonic coefficients
Add run_module_suite in odf.py
Merge branch 'shm_coeff_in_peaks_from_model'

Conflicts:
	dipy/reconst/tests/test_odf.py
checkout
checkout
Merge branch 'return_peaks_directions'

Conflicts:
	dipy/reconst/odf.py
	dipy/reconst/tests/test_odf.py
resolved conflicts
Merge branch 'return_peaks_directions'
Changed some ndindex stuff
Merge branch 'return_peaks_directions'

Conflicts:
	dipy/reconst/odf.py
checkout
Merge branch 'return_peaks_directions'
Merge branch 'nipy-dipy-master'
Merge branch 'upstream_master'
Merge branch 'upstream_master'

Conflicts:
	dipy/reconst/odf.py
Merge branch 'upstream_master'
Fixed ravel_peaks option
Readded good, unbroken test file
Readded good, unbroken test file
Readded good, unbroken test file