Update to elasticsearch v1.0.0.RC2
.travis.yml conflict merged
Fix setting shard timeout

It was accepting the value but doing nothing.

Closes #547
Merge pull request #548 from nik9000/fix_bulk_timeout

Fix setting shard timeout
Update changes.txt with change #547
Add aggregations
Merge pull request #550 from jlinn/aggregations

Add aggregations
Updated to Elasticsearch 1.0
Changes.txt to elasticsearch 1.0 adapted
Prepared release v1.0.0.0
Update dependencies in README file
Moved from Apache license to MIT license