Upgrade to ember rc2