Re-formatted for IntelliJ (from Eclipse). Also removed thread-per-region and switched to thread-per-client. Starting updating.