Updated to ember 1.7