Added test for TODOs in Django. Removed n^2 scan for merging comments.