WIP [BUGFIX beta] router.js refactor

This is the Ember side of work done here:

https://github.com/tildeio/router.js/tree/refactor

Not ready to be merged yet