Activity stream enhancements.
Merge pull request #1227 from garnertb/activity_stream_rebase

Activity stream enhancements.