Merge/update to ember data master branch

Soo, now that we finally managed to make the switch to ember-data-evolution, I just though why not bring it up to date. I have built the file and everything seems to work fine in my app.