Added timestamping to the server's logging output.
Did some housecleaning and removed a conflict file.