Cleaning up determining whether to include port. Fixing regression in git.py of pickme_id being removed in URL generation