Merge branch 'master' of https://github.com/foutoucour/tweepy into foutoucour-master

Conflicts:
	tweepy/api.py

diff --cc tests/test_api.py
Simple merge

diff --cc tweepy/api.py
index a5e09e1171ab4c89ed18561f271f73cf35695c39,0ab04d3960fd8706b4f5dc62b7fc846e7786f996..3df6ebc671325bae39d79fb84388ceb9538d6302
--- 1/tweepy/api.py
--- 2/tweepy/api.py
+++ b/tweepy/api.py
@@@ -31,13 -31,18 +31,24 @@@ class API(object)
          self.retry_delay = retry_delay
          self.retry_errors = retry_errors
          self.timeout = timeout
 +        self.wait_on_rate_limit = wait_on_rate_limit
 +        self.wait_on_rate_limit_notify = wait_on_rate_limit_notify
          self.parser = parser or ModelParser()
 +        self.proxy = {}
 +        if proxy:
 +            self.proxy['https'] = proxy
 +
+         # Attempt to explain more clearly the parser argument requirements
+         # https://github.com/tweepy/tweepy/issues/421
+         #
+         parser_type = Parser
+         if not isinstance(self.parser, parser_type):
+             raise TypeError(
+                 '"parser" argument has to be an instance of "{}". It is currently a {}.'.format(
+                     parser_type.__name__, type(self.parser)
+                 )
+             )
+ 
      """ statuses/home_timeline """
      home_timeline = bind_api(
          path = '/statuses/home_timeline.json',