merge social keys back into PGfb

The repo's have diverged a lot, merging back.