Adding Wercker/S3 goodies