Cleanup Intl middleware and routes

This does some cleanup to simplify the `intl` middleware and also
cleans up the route handlers.
Merge pull request #147 from ericf/middleware-route-cleanup

Cleanup Intl middleware and routes