Updated the master config file with some options, made it down to the color option. Looking at how this is set up, things might need to be moved around.
Merge remote branch 'upstream/develop' into develop
Updated the master configuration docs to fill out the rest of the items that were missing from the docs, also moved some stuff around so it was in the same order as the actual master conf file.
Merge remote branch 'upstream/develop' into develop
Fixed some errors that were getting generated.
Merge remote branch 'upstream/develop' into develop
Updated the salt bootstrap tutorial with an example to download the latest stable release with curl moved the wget example so it is right below the curl example to ensure users get the stable as opposed to the develop on accident. Fixed a weird wording issue, and some line lengths, though several still remain.
Merge pull request #9705 from gravyboat/develop

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