back to a stable state, added acts_as_commentable...
got comments working.
added commenting
resolved conflict
resolved conflict
resolved conflict