Feature/elasticsearch v2

this should be removed for production - it is unnecessarily verbose