Updated to lastest Ember and clean up firstSelected code