Add host resources to the events on container's change
Merge branch 'master' into track-host-resources

Conflicts:
	harpoon-agent/api_test.go
Merge pull request #75 from soundcloud/track-host-resources

Add host resources to the events on container's change
Track state of (un)scheduled jobs and add test
Merge branch 'master' into scheduler

Conflicts:
	harpoon-scheduler/shepherd.go
	harpoon-scheduler/transformer.go
	harpoon-scheduler/transformer_test.go
Merge pull request #66 from soundcloud/scheduler

Track state of (un)scheduled jobs
Change memory resource to be uint64
Merge branch 'master' into int-for-memory

Conflicts:
	harpoon-agent/api.go
	harpoon-agent/lib/agent.go
	harpoon-agent/lib/mock.go
	harpoon-agent/main.go
	harpoon-scheduler/scheduling_algorithms.go
	harpoon-scheduler/scheduling_algorithms_test.go
Merge pull request #77 from soundcloud/int-for-memory

Change memory resource to be uint64
Merge branch 'master' of github.com:soundcloud/harpoon into port-race-fix
Restored mistakenly deleted return function.