addressed most of Stephan's modifications and corrections
Merge branch 'sph_deconv_clean' of git://github.com/Garyfallidis/dipy into sph_deconv_clean
DOC: removed /emph