bring in ember-data master changes
Merge pull request #33 from stefanpenner/merge-ember-data-master

bring in ember-data master changes