Clean up __main__

Logic is a bit clearer. Handling config vs command line arguments now
being done with __main__ instead of uploader.
Update `changes committed` message to `uploaded`