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