Move to/from husbando list

Consolidating genders, extending categories, fixing names. All in a day's work.
Move to/from waifu list

Consolidating genders, extending categories, fixing names. All in a day's work.
Merge pull request #15 from will1b/master

Consolidate genders