Fix incorrect call to state.single in npm pkgs test
Removed unused format() arg in npm state

Closes #14885. Thanks @cvrebert.
Git ignore
Continue if master in multi-master is down
Merge pull request #14902 from cachedout/ignore_grains

Git ignore
No pending arg exists anymore
Merge pull request #14910 from thatch45/2014.7

No pending arg exists anymore
Fix esky updates
update raet install docs for 2014.7
Merge pull request #14922 from thatch45/2014.7

update raet install docs for 2014.7
Merge pull request #14895 from whiteinge/npm-cleanup

Fix npm test; npm state pylint fix
Merge pull request #14904 from cachedout/fix_14099

Continue if master in multi-master is down
Merge pull request #14905 from UtahDave/update_esky

Fix esky updates
Merge branch '2014.7' into develop

Conflicts:
	doc/topics/transports/raet/index.rst
	salt/minion.py