Cleaned up server files.

Also updated the server Makefile and executable.