Added FB, G+ and Fallback

Now merged to upstream and is just an easy pull