Updated to Ember-Data beta2. Updated code.
Is quite a bit simpler now!