Add scheduler integration tests
Merge branch 'master' into integration-tests
Merge pull request #80 from soundcloud/integration-tests

Add basic integration tests for the scheduler
Minor changes in tests
Redirect logs during testing
Add Wait function in agent client. Refactor tests.
agent: don't recover 0 containers
supervisor: update newContainer stub
Makefile: release: update for new names and godep
Makefile: dep target: don't need GOOS/GOARCH
Merge pull request #84 from soundcloud/integration-tests-fixes

Add Wait method in client api and fix integration tests
Merge branch 'master' into recover-ports

Conflicts:
	harpoon-agent/recovery.go
Address review comments.