tweet with user merged with master...again, sigh

I think you merged my branch right after I (yes, shamefully) force pushed and reset to your upstream/master, hence, why the pull request didn't have any problems. This pull request, AFAIK, should be in sync with your latest master. Sorry for the confusion and yes, I'm ashamed of using `git push --force`