Adds --show-timeout to force the display of unresponsive minions
Removes debugging and badly merged code
S3 - Check for code attr before using in error message
Merge pull request #7123 from techhat/s3assump

S3 - Check for code attr before using in error message
Fixed getting model
Tweaks to faq with aim of aiding beginners
Merge pull request #7125 from joehealy/faq_tweaks_1

Tweaks to faq with aim of aiding beginners
Link directly to id param docs
Add new ssh doc pages to toctree
Merge pull request #7126 from terminalmage/docs

Two docs commits
Fix broken link in FAQ

The link to "state.hightstate" in the 3rd bullet point was not properly
formed, so the hyperlink failed to create.

Also massaged the paragraphs explaining the difference between the
cmd.run and cmd.wait states.
Merge pull request #7127 from terminalmage/docs

Fix broken link in FAQ
lookup name in the token data
Clober user field in eauth
Support passing the workspace to work in.
Pass the parsed options to the methods.
Add another pip installed VCS test case using `git+git://`
Fix issue #6833
On file.recurse don't recurse into directories that aren't direct descendants

When getting files as recurse candidates in the file.recurse state, directories that are not descendants of the recurse source folder but which are descendants of the root folder are being included as candidates for being copied as a part of the state.  With this change, once we have a relative filename, we check to see if the file is a descendant of the recurse root, and skip that file if that is true.
"ScientificLinux" has been added to _OS_NAME_MAP and map "ScientificLinux" to "RedHat" in _OS_FAMILY_MAP

tested on Scientific Linux CERN SLC release 5.9 (Boron)