Only detect real JSON parsing errors
Merge pull request #587 from idio/json-error-catching

Only detect real JSON parsing errors
Update to elasticsearch 1.1.1
Remove CustomFiltersScore and CustomScore query as removed in elasticsearch 1.1.0
Fix MultiMatch test queries for es 1.1.0
Replace CustomScore in SearchTest trough FunctionScore
Update Node Info to use plugins instead of plugin
Add comparison to json check with JSON_ERROR_NONE to make it more readable
Fixed GeoPolygonTest for elasticsearch 1.1.0
Remove php 4.0.* dependency from composer file as builds with this version on travis are really slow
Fix mapping issue for aliases #588
Prepare release v1.1.1.0
Update elasticsearch version in README to 1.1.1
Handling HasChild ES bug, closes #585
Updating changes.txt
Merge pull request #590 from MrHash/master

Handling HasChild ES bug
Fix and move index mapping tests
Fix Type::getMapping when using an aliased index
Merge pull request #591 from idio/alias-mapping

Fix Type::getMapping from aliased index
escape / with \\