actually resolve the router

depends on: https://github.com/emberjs/ember.js/pull/3360