- Simplified verbose and debugging flag code.
- Simplified verbose and debugging flag code.

- Fixed the bug in --upload that caused the default to be the empty string if
  none was specified.

- Removed spurious '/' in default upload URL.

--HG--
extra : convert_revision : svn%3A39a105f4-52d6-0310-bb1b-d6517044f2e4/trunk%40855

ged/mues