Removed crossdresser trait, added stylish trait

Clothes can now be FANCY or SUPER_FANCY and can no longer be MALE or FEMALE typed.
Update makefile for OSX
Merge replacing cross-dresser with fancy, and osx make fix.
Revert unintended indentation change in armor.json.
Merge pull request #4 from CleverRaven/master

master fix