Refactored MasterServerQuery files

Still could possibly clean up QueryWorker (duplicate code with the
static ChivServer.createChivServer())