Merge pull request #266 from julianhille/master

GeoDistanceFilter issue
use dict constructor instead of dict comprehension

dict comprehension is not supported in python 2.6
support wrap a Query in ConstantScoreQuery

See http://www.elasticsearch.org/guide/reference/query-dsl/constant-score-query.html
Merge pull request #268 from haiwen/master

use dict constructor instead of dict comprehension; support wrap a query in a constant score query
Add JDBC River support
Merge pull request #269 from CGenie/cgenie

Add JDBC River support
added 'sum' to possible score types
add option for optimize_bbox in GeoDistanceFilter
resultset.hits should not be set by _do_search
Merge pull request #271 from iserko/resultset_hits_attribute_fix

getting the attribute hits from a ResultSet results in inconsistent behaviour
Merge pull request #270 from nahap/master

added optimize_bbox to geodistanceFilter and 'sum' to score types in TopChildrenQuery
Fix for field=value in the form of meta__title='title', modifier is not False but is wrong.
Merge pull request #273 from mindflayer/master

Wrong assumption on field/value couple
Support for Update API.

Fixes #250
Fix, it must be a tuple.
Merge pull request #275 from mindflayer/master

Fix, it must be a tuple.
"upsert" support in update API.
Tests for update API.
Merge pull request #274 from andreas/master

Initial support for update API
catching ValueError in mark_dead