Merge pull request pardot#7 from dcunning/master

Handle additional net-related errors

Author: znbailey

lib/pardot/http.rb

@@ -9,7 +9,7 @@ def get object, path, params = {}, num_retries = 0
     rescue Pardot::ExpiredApiKeyError => e
       handle_expired_api_key :get, object, path, params, num_retries, e
 
-    rescue SocketError, Interrupt, EOFError, SystemCallError => e
+    rescue SocketError, Interrupt, EOFError, SystemCallError, Timeout::Error, MultiXml::ParseError => e
       raise Pardot::NetError.new(e)
     end
 
@@ -21,7 +21,7 @@ def post object, path, params = {}, num_retries = 0
     rescue Pardot::ExpiredApiKeyError => e
       handle_expired_api_key :post, object, path, params, num_retries, e
 
-    rescue SocketError, Interrupt, EOFError, SystemCallError => e
+    rescue SocketError, Interrupt, EOFError, SystemCallError, Timeout::Error, MultiXml::ParseError => e
       raise Pardot::NetError.new(e)
     end