Reload locale even if it is set to null.
Remove '-' from valid account names again.
This could cause issues with NPC's converted to UUID before this version.
Merge pull request #5 from essentials/2.x

Update base