Minor doc update
Upload takes a file argument
Extract error detail
Merge branch 'master' of https://github.com/slipstream/SlipStreamClient

Conflicts:
	client/src/main/python/slipstream/HttpClient.py