Fixes bug with r520 using the email local variable instead of the outer scope's email variable.
Fixes bug with r520 using the email local variable instead of the outer scope's email variable.

Also, makes the diff post processing a separate step. This allows for creating
a custom diff with a git checkout, but still having the necessary
post-processing to make the upload actually work.

Patch from Ojan Vafai <ojan@chromium.org>.

riannucci/rietveldv2,riannucci/rietveldv2