Fix deadlock in agent representation
Merge branch 'master' into scheduler-agent-repr

Conflicts:
	harpoon-scheduler/xf/xf.go
Merge pull request #105 from soundcloud/scheduler-agent-repr

Fix deadlock in agent representation