Lots o clean up
Merge branch 'master' of github.com:joshuaadrian/social-feeds