working on s3
Merge branch 'master' of github.com:maximusfowler/true-speak
s3 for most stuff