C++ server code

Latest master merged in. We should discuss the layout of the code.
The indentation seems fine to me. At least according to the conventions I follow (Indent after just about every open curly brace). Am I missing what you're highlighting?