Merge from Moritz branch. Clean-up is still needed.

Refactor argument parsing + New commands

Merging pull request for rs uploading

(0) -10 -3 +3 +10 +30 tip

mercurial