Savage Worlds Fixes

Added trained attributes and fixed skill macros to reflect it.
fixed parry to calculate correctly.