Removes the loophole ion-law. Adds in some other ion law changes.
Merge pull request #5997 from PsiOmegaDelta/Ion

Removes the 'loophole' ion-law