More Jedi Expertise Work

Lots of fixes and updates to Jedi expertise. Everything included in this
update should now work properly, changing the characters stats correctly
based off of expertise choices. Added a line in CombatService that
factors in melee damage increases from expertise when determining raw
damage.