Fixed mass unit definitions

Need to put dictionary keys in single quotes, remove recursive references (still need to complete for other unit types)