Merge branch 'sam_cloud' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Allow editable=. for pip.install
Add unit test for event timeouts
Catch os.error instead of all Exceptions
Support Oracle Linux 5.x

Oracle Linux 5, also known as Unbreakable Linux is currently
not supported by salt.

This one line fix solves this issue.

For reference, the os info extracted through platform.linux_distribution()
python call:
('Enterprise Linux Enterprise Linux Server', '5.1', 'Carthage')
Fixes issue #8951 - gem install fails when rvm is set up with another user
switches paths to state files to use forwardslashes on masterless windows
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Added debug
Support to appending extra_install_flags to windows installer from the winrepo
Support to appending node specific extra_install_flags to windows packages
Fix for unknown version numbers when installing windows packages
Fix pillar include example

Fixes #9034
Merge pull request #9050 from basepi/pillarincludedocs

Fix pillar include example
Added fallback to manage.present to use lsof to get open connections for oses where /proc is not available
This allows  manage.present to work on non linux but unix oses.
Don't trigger the name resolution at import time. Fixes install on Windows machines.