Revert "Update code for newest ember-model"

This reverts commit 1594130ff300203e326ec0864a25f3c8c700b3b0.
Revert "Update ember and ember-model"

This reverts commit 408cce2d4f4735e76558d10223ba3d61ed8bf584.