Merge in some Twilio fixes and new SocialSubscriptions for Facebook.
Merge branch 'master' into daniel