Elasticsearch now started at boot time via upstart
Merge branch 'master' of https://github.com/eembsen/elk