Keyring Changes

Gigaom Specific Keyring Changes (until we can convince Beau otherwise)

https://github.com/GigaOM/gigaom/issues/4162

Also:
https://github.com/misterbisson/bsocial/pull/20
https://github.com/GigaOM/gigaom/pull/4160
https://github.com/GigaOM/gigaom-plugins/pull/1722