Properly fixed #22 this time by adding proficiency bonus to ranged weapon.

Also did a refresh and tidy of the entire section to make it much easier to use now including splitting of attack and damage rolls and displaying to hit and damage bonuses for both weapon types.  Should be pretty much done with the wepon section for now