NF: peaks_from_models now can also output spherical harmonic coefficients
Add run_module_suite in odf.py
Added a space on the line break.
Merge branch 'shm_coeff_in_peaks_from_model'

Conflicts:
	dipy/reconst/tests/test_odf.py
checkout
checkout
Merge branch 'nipy-dipy-master' into correct_typo
Added some words to a print
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'
Pdf now is real with the negative values setted to 0
integrate the rt0p from the signal
integrate the rt0p from the propagator
integrate the MSD discrete verison
add the normalization for the b0 in the rt0p_signal