Changed some headers that seemed to conflict on slightly older versions of msvc
Merge conflict resolution
Merge branch 'master' of github.com:EQEmu/Server
Removed more socket server stuff, changed some of the build stuff.