Fix #18: don't upload original media by default, add new command line options