Merge branch 'master' into ts/lists_ownerships

diff --cc docs/api.rst
Simple merge

diff --cc tests/test_api.py
Simple merge

diff --cc tweepy/api.py
Simple merge

diff --cc tweepy/models.py
index 45fd08f4e05d7366c6328f4292325b60a39ad993,bafd910ecca4a3c457c66a6fab17695e5e6550a1..2ced5c1867b4ba5737e34c3ddafd8db91cedc346
--- 1/tweepy/models.py
--- 2/tweepy/models.py
+++ b/tweepy/models.py
@@@ -196,13 -190,8 +190,13 @@@ class User(Model, Hashable)
                                             *args,
                                             **kwargs)
  
 +    def lists_ownerships(self, *args, **kwargs):
 +        return self._api.lists_ownerships(user_id=self.id,
 +                                          *args,
 +                                          **kwargs)
 +
      def lists_subscriptions(self, *args, **kwargs):
-         return self._api.lists_subscriptions(user=self.screen_name,
+         return self._api.lists_subscriptions(user_id=self.id,
                                               *args,
                                               **kwargs)