Modified default routes + wrapper

The wrapper isn't really working properly, I have to figure out where
I'm doing things wrong. The idea is to avoid the two different routes
and handle everything through a cgi `html' parameter.