Errors resulting from Elasticsearch Timing out should yeild 504 Gateway Timeout errors, rather than plain old 500 errors.

[pgulley]

In the spirit of improving performance, we should have errors thrown that reflect the error actually occuring- right now the api opines rather blithely about query formatting by default.