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
do not import djangoutils in __init__.py