Re-added a change to comments grammar entry that was inadvertently obliterated during a previous merge. Before this commit, a couple of the test cases in CommentTest failed. They all pass now.
Re-added a change to comments grammar entry that was inadvertently obliterated during a previous merge. Before this commit, a couple of the test cases in CommentTest failed. They all pass now.

jhclark/ducttape,jhclark/ducttape,jhclark/ducttape