Copied in existing elasticsearch config (because I'd used submodules to ruin the git history anyhow...)
Merge branch 'megamerge' into revision

Conflicts:
	manifests/init.pp