Ember update

Fixed a few bugs with the Ember decorator