Stuff
Merge branch 'example_cc' of github.com:samuelstjean/dipy into example_cc

Conflicts:
	dipy/segment/mask.py
stuff