Fix #30 - Split out weapon bonus to seperate melee/ranged bonuses and hooked them into the appropriate melee/ranged weapon macros