Switch to versioned image and Makefile for Fluentd/Elasticsearch image

Did you intend to remove this? You just added it earlier today...