Fixes bug 1114552 - Added Query service to es module.

@phrawzty r?
Good call on allowing `timeout` to be set here.