Merge pull request #82 from BloomBooks/develop

Merge develop to master
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #113 from BloomBooks/develop

Merge develop to master
Merge pull request #116 from BloomBooks/develop

Merge develop to master
Merge pull request #118 from BloomBooks/develop

Merge develop to master
Merge branch 'develop'
Merge branch 'feature/preflightDownloadImprovements'
Update download urls to use s3
Merge branch 'master' into develop