Merge branch 'r0.4_action_dag_diagram' of github.com:dnephin/Tron
Merge branch 'r0.4_docs' of github.com:dnephin/Tron
Merge branch 'r0.5_remove_deprecated_config' of github.com:dnephin/Tron

Conflicts:
	tron/mcp.py
Merge branch 'r0.5_replace_twistd' of github.com:dnephin/Tron

Conflicts:
	dev/dev-logging.conf
	tron/mcp.py
Merge branch 'r0.6_service_refactor' of github.com:dnephin/Tron
WIP, Refactored event code.
Event recorder with tests.
New event recorder integrated with jobs and services, and tests fixed.
Merge branch 'r0.5_graceful_shutdown' of github.com:dnephin/Tron
Merge branch 'r0.6_refactor_event_recorder' of github.com:dnephin/Tron
Remove unsused slot from EventRecorder.
Merge branch 'master' of github.com:Yelp/Tron into r0.6_refactor_event_recorder
Merge branch 'release_0.5.0' of github.com:dnephin/Tron into r0.6_refactor_event_recorder
More tests.
Merge branch 'master' of github.com:Yelp/Tron into r0.6_service_refactor

Conflicts:
	tron/service.py
Merge branch 'master' of github.com:Yelp/Tron into r0.6_refactor_event_recorder

Conflicts:
	tests/api/www_test.py
	tests/core/job_test.py
	tests/mock_daemon.py
Merge branch 'r0.6_service_refactor' of github.com:dnephin/Tron into r0.6_service_refactor
Merge branch 'r0.6_refactor_event_recorder' of github.com:dnephin/Tron into r0.6_service_refactor