Oops - left the compress commented out
Merge branch 'develop' of git.ccnmtl.columbia.edu:mediathread into develop
merging