Make tests pass on Scipy 0.12.1
Merge pull request #2686 from mdboom/modeling/scipy-0.12-tests

Make tests pass on Scipy 0.12.1