Added maven build support in addition to Ant.  Also some minor test fixes and other small refactoring.
rename Upload to upload, and add additional upload() override for input stream
Add additional upload overrides