Typo error.
Merge branch 'master' of https://github.com/aparo/pyes into develop
Added script field
Added long to resultset slice
Added ResultSetList to manage fixed resultlist
Merge branch 'develop' of https://github.com/aparo/pyes into develop
Fixed version 1.0.0beta
fix indentation error
Merge pull request #379 from jengdal/develop

Fix indentation error in es.py
- Added aggs to pyes
- Two types of aggs, Agg and BucketAgg, where BucketAgg can handle a list of SubAggs
- test coverage missing, but in progress, would appreciate a little help though
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	pyes/es.py
Initial upgrade to ElasticSearch 1.x
Merge pull request #385 from mgellesch/develop

Develop: Added beta of Aggregations
Merge branch 'master' of https://github.com/aparo/pyes into develop
Fixed conflict
Initial code migration to fully support ES 1.x
Initial migration document
Migrated delete_by_query to ES 1.x
Migrated StringQuery -> QueryStringQuery to use ES naming convention
Fix to pass all query tests