Adding some clarification about the use of --out=json and the output.
Added new "osfinger" grain

This grain is a unique identifier for a given OS and OS version that can
also be used as the key in a dictionary. For example a fingerprint for
CentOS 5.9 would be "CentOS-5", a fingerprint for Precise would be
"Ubuntu-12.04".
Fix for #6601
whitespace
fix old style class
whitespace
new style class
Add super call to yumpkg
inheriting from old style class...
some copyedits to rh_ip module
pep8 indentation adjustments that agree w/ Salt style guide
bridge mod: rm unused exception vars
salt.states.mysql_grants:
When grant_option=True, then this state is never succeed as 'WITH GRANT
OPTION' is cut off while checking for user grants. But actual grants are
set properly.
Fixed.
support wheels and runner

Conflicts:
	salt/utils/minions.py
Fix token auth in wheel api

Conflicts:
	salt/master.py
log token error correctly
allow kwarg to be passed to run_job
Fixed bug. Check for empty clear_load['jid'] was occuring after fire_event which produced
empty tag in event. Fix now ensures tag is valid.
Note this may fix bugs with syndic FYI "Colton"
Add osarch grain
Properly handle 32-bit packages for debian32 on x86_64

Conflicts:
	salt/modules/pkg_resource.py