Reworked tooltips to all be in one place and corrected the the weight unit display. close #334
Forgot to include the new tooltip file. #334
Merge remote-tracking branch 'upstream/master'