Deal with 404s properly without an internal server error
Merge branch 'master' into software-ianrenton-com