2.0

With just the "Email me when someone starts a new discussion" preference checked, users were getting notified of every comment which was created. This change puts in place the correct behaviour. This has been fixed differently in the 2.1 branch, but since some new preferences were added, the code is a little complicated to back-port.