Vanilla Beta 2.1.5.5 Update

Judging from the patch notes for this, it looks like there may be issues
with using large weights like 10000 in factions and possibly elsewhere.
Merge pull request #167 from thefinestsieve/beta

Vanilla Beta 2.1.5.5 Update