More combat simplifications: dodge and parry bonuses

[mciul]

I like the way block bonuses got rolled into shield stats. Is there any chance we could do this for weapon dodging and parrying bonuses? Both get a basic bonus of 2, but I thought perhaps that could be folded into weapon dodge and parry-against bonuses. It would simplify the math a little, which I would find very helpful.

I volunteer to use my search-fu to update all weapons if we agree to do it.