Make content-type detection consistent between file types

This is a follow-up to !122 (merged)

We modified the serveFile route, but not the serveCustomFile route. It's probably that serveCustomFile will only ever deal with .html files, and so the new code will never be touched, but I like the consistency.

I've also taken the opportunity to add some whitespaces to the code to make it easier to read.