Added wait_for_event function to saltmod

This allows the orchestrate system to watch the event bus for arbitrary
events.
add expand_repo_def needed by states pkgrepo.managed
fix pylint add extra line
Added an env arg to npm module & state

Because npm can be configured using env vars.
Also pass runas and env through to npm.list
Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed
Merge pull request #14935 from whiteinge/salt-orchestrate-event

Added wait_for_event function to saltmod
Documented the expansion additon to names

Added docs for the addition in #13489.
Merge pull request #14955 from mcalmer/zypper-add-expand_repo_def

add expand_repo_def needed by states pkgrepo.managed
Merge pull request #14964 from whiteinge/salt-npm-env

Add env support to npm
Merge pull request #14967 from rallytime/pillar_tests

Add skipIfs to pillar tests if GitPillar 0.3.2rc1 or > isn't installed
Merge pull request #14971 from whiteinge/doc-names-override

Documented the expansion additon to names
Merge remote-tracking branch 'upstream/2014.7' into develop

Conflicts:
	salt/modules/npm.py