Move to/from husbando list

Consolidating genders, extending categories, fixing names. All in a day's work.