wget --timeout does not do what I thought it does. Should be --connect-timeout
Merge branch 'master' of github.com:puphpet/puphpet