Fix server NPE: non-dict items in Unifier prefs
Renamed an arg in MFRReg to be more descriptive
Merge branch 'master' of https://github.com/powercrystals/MineFactoryReloaded