Update contributors
    
    Add missing developers contributing to project git. Cancel "Past and
    Occcasional" section and merge the people in the right categories.
    
    Update .mailmap so that the Developer list can be easily re-generated.
    
    Reviewed-By: Gabe Alford <redhatrises@gmail.com>