Merge branch 'master' into chunk_compression
Merge pull request #318 from SuperCowPowers/chunk_compression

Merge branch 'master' into chunk_compression