RF - fixup peaks_from_model to take use remove_similar_vertices and

[MrBago]

I added a return_index keyword to remove_similar_vertices so that we could let go of _filter_peaks.

[stefanv]

I think we had a more descriptive docstring for this before. Was that in another function?

[stefanv]

Looks good to me.

[Garyfallidis]

Travis fails :(

File "/usr/local/lib/python2.7/dist-packages/dipy/sims/voxel.py", line 257, in dipy.sims.voxel.multi_tensor_odf
1039Failed example:
1040 odf = multi_tensor_odf(vertices, [0.5,0.5], mevals, mevecs)
1041Exception raised:
1042 Traceback (most recent call last):
1043 File "/usr/lib/python2.7/doctest.py", line 1289, in __run
1044 compileflags, 1) in test.globs
1045 File "<doctest dipy.sims.voxel.multi_tensor_odf[8]>", line 1, in
1046 odf = multi_tensor_odf(vertices, [0.5,0.5], mevals, mevecs)
1047 NameError: name 'vertices' is not defined

[MrBago]

I re-based this onto the fixed master and it's passing now.