Get uploader tests building again
Update to new auth method for tests
Handle nil progress block being passed in
Shift standard progress reporting into file op
Merge branch 'v2.x-beta' into uploader-urls