Update to work with ember 1.5.1, ember data 1.0.0