Add urlopen() check to resolve()
Merge remote-tracking branch 'upstream/master'
adjust captcha image, improve captcha library to not require image
filename; remove pop-ups from editted resolvers
Dramatic simplification of billionuploads resolver and make it work on
the first try
Merge pull request #225 from tknorris/master

Add urlopen() check to resolve()