Merge pull request #2 from cashmusic/master

whatever
wokring social feed backend stuff
Merge pull request #529 from jessevondoom/master

working social feeds on the backend at least...