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
rm unused import from zcbuildout state

salt/states/zcbuildout.py:41: [W0611(unused-import), ] Unused import re
modules.lvs: use alias to avoid shadowing `list` built-in type

salt/modules/lvs.py:353: [W0622(redefined-builtin), list] Redefining built-in 'list'
cp mod: honor `env` argument in list_master() & hash_file()

************* Module salt.modules.cp
salt/modules/cp.py:441: [W0613(unused-argument), list_master] Unused argument 'env'
salt/modules/cp.py:548: [W0613(unused-argument), hash_file] Unused argument 'env'
Add note about topfiles to state.show_sls
Merge pull request #9000 from basepi/showslsnote

Add note about topfiles to state.show_sls
make zcbuildout._Logger a new-style class

salt/modules/zcbuildout.py:106: [C1001(old-style-class), _Logger] Old-style class defined.
pep8 fixes
pylint fixes
Merge pull request #9005 from makinacorpus/lint-fixes

Lint fixes
buildout fixes from 996c7950ccca49567693b890f37f113a227fff80
make buildout test more robust
do not expose exceptions
more doc for buildout