Additional edits of Stephenmoloney fix/disc format#408

Open

andersla wants to merge 10 commits intomasterfrom

stephenmoloney-fix/disc_format

Commits on Jun 2, 2018

changes for uploading an image with a different disc_format
stephenmoloney
committed

Commits on Jun 13, 2018