Content API timeouts

504 on a content API timeout instead of the more generic 500.

http://en.wikipedia.org/wiki/List_of_HTTP_status_codes#5xx_Server_Error