Merge pull request #452 from creationix/curl_wget_handling

Better combo curl/wget handling