Import changes from local repo

We had to fork the Twitter repo as we didn't have write access to the RTW version. Since we have access now, we figured we should merge these changes.