Merge branch 'master' into api-v2

diff --cc tests/test_api.py
index f4245ebf0bc9d6dd237dfdf4d01e5c003b72ccca,3c03b12535f6fcd8ded5e9705ad4a0e5ad36e22c..24c7047dcf48e5305556b01e64ace7632f188176
--- 1/tests/test_api.py
--- 2/tests/test_api.py
+++ b/tests/test_api.py
@@@ -5,9 -5,8 +5,9 @@@ import tim
  import unittest
  from ast import literal_eval
  
- from .config import tape, TweepyTestCase, use_replay, username
+ from .config import tape, TweepyTestCase, username
 -from tweepy import API, FileCache, Friendship, MemoryCache
 +from tweepy import API, FileCache, MemoryCache
 +from tweepy.models import Friendship
  from tweepy.parsers import Parser
  
  test_tweet_id = '266367358078169089'