Fix s3 integration tests on windows

Need to close the file before exiting the with statement,
otherwise we still have a reference to the file obj, which
means we can't delete the file on windows.
Fix pep8 formatting
Merge branch 'integ-windows' into develop

* integ-windows:
  Fix pep8 formatting
  Fix s3 integration tests on windows