Merge branch 'feature/dockerify' of github.com:prometheus/prometheus into feature/dockerify

Conflicts:
	Dockerfile