Journalism and marketing were once diametrically opposed. Has that changed in the social media era?