Bring Router.coffee up to date

In the last commit only Router.js was updated.
This pull-request brings Router.coffee on a par with Router.js.
Additionally some coffee-script style improvements have been made.