Switch to versioned image and Makefile for Fluentd/Elasticsearch image

cool, just checking for merge errors :)