Small refactor for new then cancel
Update to ember data 1.0.0 beta 2