Updated option handling for current libcurl CVS. Some cleanups.
Updated option handling for current libcurl CVS. Some cleanups.

p/pycurl-archived,pycurl/pycurl,p/pycurl-archived,pycurl/pycurl,pycurl/pycurl,p/pycurl-archived