tidying up
Merge github.com:exane/js_router