Update to EQEmu Master

Merging stuff...