Some debugging fixes.
Add some logic to prevent paragraph detection from extending from
a non-comment scope to a comment scope.  This is far from optimal,
but should handle some latex situations.
Merge remote-tracking branch 'origin/master'