Travis should now deploy to s3 when sucessfully merged to master.
Merge pull request #1 from ewilson/travis

Travis should now deploy to s3 when successfully merged to master.
Merge branch 'master' into upgrade

Conflicts:
	.travis.yml