Update Ember and Ember-Data
Cleanup
Work on Ember update (busted)