Jsirois/twitter sync

This pulls in twitter-internal jvm work since the last sync just over a year ago.