[Katie & Jo] Upgrade ember to master