Update tools
Initial commit Scala + S3
Fix conflicts