Add Configuration chapter header
Re-organise configuration chapters

Match is now linked to instead of included, and included in the TOC too.