Updating shim.py to match latest features.#1752

thomasmaclean wants to merge 1 commit intoGoogleCloudPlatform:masterGoogleCloudPlatform/gsutil:masterfrom

thomasmaclean:shimpythomasmaclean/gsutil:shimpyCopy head branch name to clipboard