Use URI.escape instead of CGI.escape

Would you mind pulling this in?  While implementing an API that has a parameter specification like, "filter=key:val" that CGI.escape was converting the colon to "%3A" so the parameter became "filter=key%3Aval".  Colons aren't revered character in URI's according to rfc3986. 

Thanks!