Don't always use the static files handler

See issue #20 for details