ES Updates
Merge pull request #18 from mreishus/feature-elastic-ds

ES Updates