merge tweepy from head
Merge branch 'master' of github.com:snarfed/activitystreams-unofficial into from_detached_head