removed mass-energy equivalence from basic units
minor bug with unit operators

I seem recall reversing these for a reason.  Whatever it was, it was not
a good reason.