Code cleanup
Update Ember to 1.7