Merge tag '2.1' of https://github.com/tweepy/tweepy

Conflicts:
	tweepy/api.py
	tweepy/binder.py
Merge branch 'master' of https://github.com/demidov91/tweepy

Conflicts:
	tweepy/api.py