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 pull request #249 from maurozucchelli/dsi_metrics_2

Dsi metrics 2
DOC: added slice of gfa together with odfs
RF: cleanup of slicer
NF: added simple camera setter function
BF: A possible bug fix for vtk6's for rendering large images
DOC: typo corrected