Better combo curl/wget handling

Fixes #451
This doesn't look like the correct replacement..