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
Fixed some minor issues encountered while performing functional tests
Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner
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
Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner
added role_create and role_delete keystone functions
added role management to keystone state
pep8 fix
Merge pull request #7196 from KennethWilke/develop

Added Keystone role management
Merge pull request #7198 from evinrude/feature_sqlite3_returner

Feature sqlite3 returner
Merge pull request #7194 from terminalmage/mac-user-group-management

Initial Mac user/group management
make sure the addr is a string
Update docstrings, fix missing import in mac user/group mods