Fixes to the router.
Merge branch 'master' of github.com:kevbook/fixie