Added /gitlib-s3/s3cache/ to .gitignore
Fix S3 unit tests, and some refactoring