Switch events to use the new get_event interface
cleanup pylint errors
cleanup pylint errors
Merge remote-tracking branch 'upstream/develop' into develop
add master_sign_key_name and generation of the actual sign-key-files if activated
make MasterKeys() more flexible by allowing different key-names.

MasterKeys() should be able to handle more than one hardcoded key.
The default is still to just handle master.* files but can also generate
new key-pairs with different names and return the pub-key.
fix join()'s to form the correct file names
add key name to logging output
Add a better string check for uri
Fix cmd.run_chroot docstring

The CLI example was wrongly referring to it as cmd.chroot_run. This
commit also adds a versionadded directive.
Merge pull request #13538 from terminalmage/fix-docstring

Fix cmd.run_chroot docstring
Merge pull request #13522 from terminalmage/docs

Add new page for ipcidr matcher
Small fix, add space for dev in route_eth.jinja
Support various versions of python-zmq (fix for #13508)

Looks like the api for determining if a socket is in a poller varies from python-zmq version to version. In my version (14.0.1) you cah do "socket in poller", it seems that older versions don't support that. So, to be compatible i've stolen the code from destroy()
Merge pull request #13468 from techhat/db

Add sdb loader type
Merge pull request #13489 from gtmanfred/names

[RFC] Allow names to override chunk variables.
Merge pull request #13394 from basepi/2014.1.5release

Add release notes for 2014.1.5 and bump docs version
Merge pull request #13540 from jacksontj/develop

Support various versions of python-zmq (fix for #13508)
Merge pull request #13472 from felskrone/improve_master_alive

Improve handling of __master_alive scheduled job
Merge pull request #13520 from rallytime/pkgrepo_doc_fix

Add enabled to pkgrepo config values