Fix up vocabulary and add terms from current idwfed.org. website.