Merge pull request #216 from edi-bice/master

--follow-redirects hangs indefinitely on certain urls
urllib2 opener open lacked a timeout parameter causing it to hang indefinitely on certain URLs where the host does not send back any data - added timeout=1 for now and will expose as parameter later - also added socket.timeout exception to list of exceptions handled