SYNR-560

+ Renamed "upload" function to "add"
- Removed some extraneous return statements
+ Changed command line tests to not require a "python setup.py install" step before running.
+ Reduced recreation of the client to speed up the test.
  + Refactored main() method into one helper