Fix trivial spelling mistake in docs
elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307
elasticsearch: run preStart as root, to allow creating the necessary directories.
Merge pull request #2928 from akc/spelling

Fix trivial spelling mistake in docs
Revert "elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307"

Was accidentally pushed.

This reverts commit 1ecb9b8de8b823addcc50035636f263caae4ea34.
Revert "Revert "elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307""

This reverts commit 61384f5627060fca90805a07af24467e5aeca5b4.
Remove -f from elasticsearch ExecStart, not valid anymore.
Add Squid 3.4.5 and enable its SSL features.