Up test timeouts even outside of Travis for those of us with slow computers :)
Merge pull request #357 from stevenschlansker/up-timeout

Up test timeouts even outside of Travis for those of us with slow computers