Reduce TOC and section numbering depth

Having subsections show up in the table of contents is unnecessary; this patch
removes them.
Merge branch 'dev' into reorg-wip