timeout/retry for file downlaods as well
Merge branch 'master' of github.com:ContinuumIO/conda