Remove 'DO NOT EDIT', as distros copy as-is.
Merge pull request #1519 from intchanter/develop

Remove 'DO NOT EDIT', as distros copy as-is.
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Add master side event evaluation
found the issue, set cwd.
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Hardcode /tmp/subsalttest dir in ssh module integration tests

I don't really like doing this, but `/tmp/subsalttest dir` is already
hardcoded in other places for running tests.

Without this, when running tests under a mounted Vagrant drive,
`ssh-keygen` doesn't have permission to create the symlink for
known_hosts to known_hosts.old, causing a test to fail.

```
======================================================================
FAIL: test_rm_known_host (integration.modules.ssh.SSHModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/vagrant/tests/integration/modules/ssh.py", line 143, in
test_rm_known_host
    self.assertEqual(ret, 'add')
AssertionError: 'exists' != 'add'
```

`link /vagrant/tests/integration/tmp/known_hosts to
/vagrant/tests/integration/tmp/known_hosts.old: Operation not permitted`
Add OpenBSD support to disk module.
Fix host file setup and fix tests.integration.states.host
Merge pull request #1520 from mattrobenolt/fix-ssh-module-tests-vagrant

Hardcode /tmp/subsalttest dir in ssh module integration tests
Merge pull request #1521 from dcolish/develop

Fix host file setup and fix tests.integration.states.host
Move tmp hosts file management to test case which requires it. Fix
test.unit.utils.find_test on OSX
Skip the rvm and gem module/state tests when mock is missing

The mock python module is required for the gem and rvm tests.
If it is not available, the tests should be gracefully skipped.

From python runtests.py -u:

test__check_and_install_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_rvm (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_gemset_present (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test_removed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test__rvm (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__rvm_do (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list_all (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_install (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__gem (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_sources_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
Merge branch 'develop' of github.com:saltstack/salt into develop
change msg to data for consistency
initial addition of event system minion module
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of git://github.com/saltstack/salt into develop

Conflicts:
	tests/unit/utils/find_test.py
Merge pull request #1524 from dcolish/develop

Move tmp hosts file management to test case which requires it. Fix
import setuptools if SETUPTOOLS  env var exists

Default to importing distutils unless the user
has created an environment variable named
SETUPTOOLS in which case import setuptools