Makefile a bit noisy, quiet it down.
Merge branch 'master' of github.com:mozilla-services/heka-build

Conflicts:
	Makefile