Add RFC for a more flexible, revised trait matching system