DOC - merge from Yariks branch
DOC - merge from Yariks branch

jyeatman/dipy,maurozucchelli/dipy,nilgoyyou/dipy,StongeEtienne/dipy,rfdougherty/dipy,oesteban/dipy,FrancoisRheaultUS/dipy,demianw/dipy,villalonreina/dipy,StongeEtienne/dipy,sinkpoint/dipy,sinkpoint/dipy,samuelstjean/dipy,maurozucchelli/dipy,samuelstjean/dipy,maurozucchelli/dipy,Messaoud-Boudjada/dipy,Messaoud-Boudjada/dipy,jyeatman/dipy,oesteban/dipy,nilgoyyou/dipy,matthieudumont/dipy,beni55/dipy,rfdougherty/dipy,villalonreina/dipy,mdesco/dipy,demianw/dipy,JohnGriffiths/dipy,samuelstjean/dipy,FrancoisRheaultUS/dipy,mdesco/dipy,matthieudumont/dipy,beni55/dipy,JohnGriffiths/dipy