Adding a test to ensure we call gulp-s3 correctly.

Using SandboxedModule and Sinon.js to mock out gulp-s3.
Merge branch 'master' into forkmaster

Conflicts:
	package.json
Fix a merge resolution error
Merge pull request #2 from cpacey/master

Adding a test to ensure we call gulp-s3 correctly.