ENH: Nicer stim timeout for Travis
ENH: Be nicer to Travis
Merge pull request #1221 from Eric89GXL/fix-test

ENH: Nicer stim timeout for Travis
FIX: Fix deprecated scipy function