Social media links redo

@JonathanPrince 

This PR is a product of rebasing master onto the social_media_links branch.
There were lots of merge conflicts and I did my best to fix without really knowing what needed to be where.

Is everything in here? Or am I missing things?