Unify not_found and error 404 behavior (Fixes #814)

This makes not_found just call error 404, instead of also handling
the Sinatra::NotFound specially.