Some re-ordering and documentation.
Keeping branch up-to-date.
Adding port to url.
Using serverport to talk to server.
Adding docstrings.