updated to latest ember-data; made small changes to appease jshint