More tables work

Set new categorical variable for discharge location to collapse
categories with <5 r's
Updated v2 tables to use these new categories
Also updated v2 tables to set %'s where n<5 to missing