Added Kibana and log stash to the repo
Improved makefile