Merge branch 'master' into api-v2

diff --cc tweepy/__init__.py
index e1a092ced2981e1e83905017628a3db9b45cd077,3082f76ff86396c161fc14fe546bc29ba030184a..1488505a88abe1ba96d0b4d6d09510d34e73e42c
--- 1/tweepy/__init__.py
--- 2/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@@ -12,17 -12,16 +12,23 @@@ __license__ = 'MIT
  from tweepy.api import API
  from tweepy.auth import AppAuthHandler, OAuthHandler
  from tweepy.cache import Cache, FileCache, MemoryCache
 +from tweepy.client import Client
  from tweepy.cursor import Cursor
- from tweepy.error import RateLimitError, TweepError
+ from tweepy.errors import (
+     BadRequest, Forbidden, HTTPException, NotFound, TooManyRequests,
+     TweepyException, TwitterServerError, Unauthorized
+ )
 +from tweepy.media import Media
- from tweepy.models import DirectMessage, Friendship, ModelFactory, SavedSearch, SearchResults, Status, User
+ from tweepy.models import (
+     DirectMessage, Friendship, ModelFactory, SavedSearch, SearchResults,
+     Status, User
+ )
 +from tweepy.pagination import Paginator
 +from tweepy.place import Place
 +from tweepy.poll import Poll
  from tweepy.streaming import Stream
 +from tweepy.tweet import ReferencedTweet, Tweet
 +# from tweepy.user import User
  
  # Global, unauthenticated instance of API
  api = API()