Merge pull request #256 from garyburd/collapse

Merge adjacent comment annotations