More @network fixes
More fixes to @network to handle the incredibly unreliable yahoo servers.
This should do it.

The mind boggles that a billion-dollar company can have a QoS this bad.

N.B. the default socket timeout setting. 
It's not required for this because I believe travis has some firewall rules that 
timeout net connections, but it's nicer when running locally where connections 
can hang for much longer. 15 seconds is very generous so I hope it's not disruptive.

cc @jreback, @jtratner
