upgraded to the latest ember-data master