Merge: nitdoc: make generated HTML easier to read/diff