update ember & ember-data... again
another version of router api.  See new tests and commit here: https://github.com/emberjs/ember.js/commit/e4af09edd357cdccfddfa684247bc43a6eaae0fe