BUG: Corrected bug in constrained optimization of E(0)=1
Merge branch 'shore_improvements' of github.com:demianw/dipy into shore_improvements

Conflicts:
	dipy/reconst/shore.py