Reference grunt-s3 via submodule for now (pointing at a bugfix branch).
Some minor tweaks to the s3 upload globs.