Collapsible comments

Removed D2 code. Added code to make Improved Threaded work in a manner that will make collapsable comments code work in a sane way.