ENH: Added two functionalities to SHORE: 1) Constrained optimization for E(0)=1 2) Outputting the fitted signal
BUG: Added the travis dependency to have cvxopt available for testing
BUG: Different approach to adding the cvxopt dependency to travis, relying on apt-get packages
ENH: Essay to guarantee compatibility with older cvxopt versions
ENH: Trying Elef's idea for CVXOPT dependencies to work in python3
ENH: Rolling back to the version which compiles on travis only for python2
Merge branch 'shore_e0_constrained_optimization' of https://github.com/demianw/dipy into demianw-shore_e0_constrained
TST: Adding another rule in the travis, to install blas/lapack for cvxopt.
TST: Remove the apt-get, duh.
TST: I guess we need to install pip3 first?
TST: no tabs allowed!
TST: Oh yeah - use the right pip (pip3).
TST: Remove typo and some more tabs (grr..)
TST: I am not even sure what happened here.
TST: Ubuntu 12.04?

http://stackoverflow.com/questions/6587507/how-to-install-pip-with-python-3
Merge pull request #1 from arokem/demianw-shore_e0_constrained

Shore e0 constrained - travis config
Merge pull request #324 from demianw/shore_e0_constrained_optimization

Constrained optimisation for SHORE to set E(0)=1 when the CVXOPT package is available
Merge branch 'nipy-dipy-master' into piesno