Refactoring to make things more reasonable.
Merge.
Refactored server configuration stuff to be a bit more user-friendly.