Merge pull request #14890 from nmadhok/improve-salt-modules

Improve Salt Docs
Fix string prefix check
Allow custom grains to overwrite core grains
Git ignore
Bring the global variables more into their context
Continue if master in multi-master is down
Merge pull request #5 from s0undt3ch/hotfix/rally-boto

Bring the global variables more into their context
Explain the number of master procs and worker_threads

Refs #13819
Increase hash chunk size 4kB->64kB

Ref. discussion in #14784.
Merge branch 'copyediting' of https://github.com/hulu/salt into develop

Conflicts:
	salt/states/win_update.py
Merge pull request #14907 from cachedout/doc_master_proc

Explain the number of master procs and worker_threads
Merge pull request #14902 from cachedout/ignore_grains

Git ignore
Merge pull request #14897 from rallytime/boto_test_fixes

Update imports and skipIfs on boto unit tests
Rename boto tests files to include '_test' at the end
No pending arg exists anymore
Merge pull request #14910 from thatch45/2014.7

No pending arg exists anymore
Fix esky updates
Fix the wrong keystone.tenant_update param

There is a description param rather than email param in tenant.
updating the ip_interfaces grain to include ipv6 addresses.
Merge pull request #14913 from jeffrey4l/develop

Fix the wrong keystone.tenant_update param