Removed forgotten if.
Add timeout parameter to (almost) all urlopen calls
Merge branch 'iguess_develop' into iguess