Start work on 2.0.x compat

Finish MassiveFactions
Finish non player MassiveFaction stuff