AO Server Merge

The server merge happened today. We will work hard to get the VhaBot up and running within a day or so with the new settings.