Ensure S3 options flow through to grunt-aws, use grunt.fail.warn instead of console.log, update branch checking