Adds --show-timeout to force the display of unresponsive minions
Removes debugging and badly merged code
Potential for for issue #7152
Fix https://github.com/saltstack/salt/issues/6785
Initial stab at the sqlite3 returner
Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner
Added the sqlite3 returner to the docs. Fixed spelling mistakes.
Missed one
Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner
Added `versionadded` where appropriate.
Merge pull request #7193 from s0undt3ch/develop

Added `versionadded` where appropriate.
Fixed some minor issues encountered while performing functional tests
Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner
Add mac user/group modules

Initial in-progress commits of mac-specific user/group modules.
add contains_whitespace

A simple utility function that returns True if the string passed to it
contains whitespace.
finish mac user/group support
Change user states to accommodate MacOS

This commit makes a couple tweaks to the user states to make them work
with the new MacOS support. It also fixes a few edge-case bugs that were
encountered while troubleshooting.
Success field also in ret events
Fixed user field in events
changed __stamp__ to _stamp in events

Conflicts:
	salt/master.py
added .DS_Store
Merge pull request #7195 from SmithSamuelM/tempdevelop

Fixed user in event data for wheel jobs. Also adding success field on successful returns