Make ES config more configurable

Conflicts:
	Dockerfile