Feed redux

An accurate changeset of Feed-exclusive stuff from the ```adi``` branch.