Add test for 404
Add middleware that handles 404's
Use 404 middleware
Merge branch 'feature-404-handling'

Implement 404-handling middleware