Updated aggregations
Merge branch 'develop' of https://github.com/Spantree/elasticsearch-talk into develop