[FEATURE ember-routing-named-substates]

Only add loading and error substates if the resolver being used is a modules based resolver.

Also, return the Ember.Router from `Ember.Router.map` instead of the `router.js` router.

Related to https://github.com/stefanpenner/ember-resolver/pull/75.
clean up after me!