Adding charge to McMd::AtomType. Fixing inter/defines.mk_r.