Merge pull request #44 from mattdvhope/master

Master to mod8
Attempting upload to S3
Merge pull request #45 from mattdvhope/mod8

Mod8 - final pull request..again