API will 404 when query does not exist
Merge branch 'api_404' of github.com:dpford/sheer into dpford-api_404
Merge branch 'dpford-api_404'