Revert SciPy change, was too significant.  Make travis work with Scientific!