Merged in Facebook support (and a handful of changes for Twilio).