Renames functions in upload.py and happiness_upload.py

Updates documentation regarding server selection.
Removes comments describing the old upload algorithm.
Merge branch '1382-rewrite-2' of https://github.com/markberger/tahoe-lafs into 1382-rewrite-2