UCF allows instructor who made 'killing spree' joke to return to work