Changes to activity feed & comments
Merge pull request #12 from kmahal/master

final kmahal fixes
fixed erics merge