Major Combat update

Preparing for the playtest by getting a massive amount of combat rules,
equipment, formatting, and other combat related changes in.