Fixed comment wrap bug and added some more wrapping for long links and what not.
Merge remote-tracking branch 'origin'