update git ignore
merge of s3 code