Merge pull request #14268 from whiteinge/salt-runner-sync-async

Add sync/async Runner calls & sync/async Wheel calls that all respect eauth
Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr

Skip test on Darwin after making an effort
lint fix
Merge pull request #14489 from thatch45/2014.7

lint fix
Added CLI examples to tls functions that were missing them
Merge branch '2014.7' into develop
Merge pull request #14491 from thatch45/develop

Merge up 2014.7
Merge branch 'fixGlusterPeeredState' of https://github.com/Starblade42/salt into Starblade42-fixGlusterPeeredState

Conflicts:
	salt/client/ssh/__init__.py
Merge branch 'Starblade42-fixGlusterPeeredState' into develop
Updated license to less restrictive Apache v2
Merge pull request #14492 from thatch45/develop

Merge PR #14473 with fixed conflicts
Merge pull request #14474 from robmessick/issue14469

add optional pre_releases argument to gem.install
Merge pull request #14454 from mickep76/new-ext-pillar-pepa

Added new ext pillar Pepa
Making note in docs and changing example
Removing trailing whitespace
Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests
TABS?!?!? Really @cro ??
Merge branch 'cro-rhel7_pkgtests' into 2014.7
Merge pull request #14493 from thatch45/2014.7

Merge #14475 with lint fixes
Merge branch '2014.7' into develop