Updated master conf docs with more options, and reorganized the document.

I've reorganized some sections, added missing items, and fixed a few things that were outdated/inaccurate. At some point it would be good to add the 'new' items that are part of the docs into the master conf.