Last updates before merging the server branch into the master script.
Move work to run on server into the main shurl script, and delete the -server script used while work was in progress.