test
s3 creds
up
Merge pull request #1 from colinmacdonald/travis-test

test
Merge pull request #2 from colinmacdonald/develop

test