Wrote scrubber for media uploads.  Finally closes #270.
Merge branch 'master' of https://github.com/concerto/concerto