Errors2

Hi! I've put your branch up-to-date with the latest ember.js and ember-data changes. Needs some squashing :)

Keep on the good work! This feature is really amazing and non-trivial.