Merge branch 'master' into premium-search

diff --cc docs/api.rst
Simple merge

diff --cc tweepy/api.py
Simple merge

diff --cc tweepy/binder.py
Simple merge

diff --cc tweepy/cursor.py
Simple merge

diff --cc tweepy/models.py
Simple merge

diff --cc tweepy/parsers.py
Simple merge