refactor so that feeds are tied to users, and that's what shows on home page
Merge branch 'master' of https://github.com/piinthecloud/SeeMore-Aquamarine